[asterisk-commits] tilghman: trunk r44810 - in /trunk: ./ funcs/func_logic.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Tue Oct 10 11:46:01 2006
New Revision: 44810

URL: http://svn.digium.com/view/asterisk?rev=44810&view=rev
Log:
Merged revisions 44808 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44808 | tilghman | 2006-10-10 11:42:19 -0500 (Tue, 10 Oct 2006) | 2 lines

Lost of a bit of logic when this was simplified between 1.2 and 1.4 (Bug 8117)

........

Modified:
    trunk/   (props changed)
    trunk/funcs/func_logic.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/funcs/func_logic.c
URL: http://svn.digium.com/view/asterisk/trunk/funcs/func_logic.c?rev=44810&r1=44809&r2=44810&view=diff
==============================================================================
--- trunk/funcs/func_logic.c (original)
+++ trunk/funcs/func_logic.c Tue Oct 10 11:46:01 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;
 }