[asterisk-commits] tilghman: branch 1.4 r44808 - /branches/1.4/funcs/func_logic.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Tue Oct 10 11:42:19 2006
New Revision: 44808

URL: http://svn.digium.com/view/asterisk?rev=44808&view=rev
Log:
Lost of a bit of logic when this was simplified between 1.2 and 1.4 (Bug 8117)

Modified:
    branches/1.4/funcs/func_logic.c

Modified: branches/1.4/funcs/func_logic.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/funcs/func_logic.c?rev=44808&r1=44807&r2=44808&view=diff
==============================================================================
--- branches/1.4/funcs/func_logic.c (original)
+++ branches/1.4/funcs/func_logic.c Tue Oct 10 11:42:19 2006
@@ -111,7 +111,7 @@
 	if (iffalse)
 		iffalse = ast_strip_quoted(iffalse, "\"", "\"");
 
-	ast_copy_string(buf, pbx_checkcondition(expr) ? iftrue : iffalse, len);
+	ast_copy_string(buf, pbx_checkcondition(expr) ? (S_OR(iftrue, "")) : (S_OR(iffalse, "")), len);
 
 	return 0;
 }