[asterisk-commits] branch jcollie/bug6082 r27088 - in /team/jcollie/bug6082: ./ funcs/func_logic.c

[asterisk-commits at lists.digium.com]

Author: jcollie
Date: Fri May 12 22:20:46 2006
New Revision: 27088

URL: http://svn.digium.com/view/asterisk?rev=27088&view=rev
Log:
Update to trunk.

Modified:
    team/jcollie/bug6082/   (props changed)
    team/jcollie/bug6082/funcs/func_logic.c

Propchange: team/jcollie/bug6082/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri May 12 22:20:46 2006
@@ -1,1 +1,1 @@
-/trunk:1-27025
+/trunk:1-27087

Modified: team/jcollie/bug6082/funcs/func_logic.c
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug6082/funcs/func_logic.c?rev=27088&r1=27087&r2=27088&view=diff
==============================================================================
--- team/jcollie/bug6082/funcs/func_logic.c (original)
+++ team/jcollie/bug6082/funcs/func_logic.c Fri May 12 22:20:46 2006
@@ -110,7 +110,7 @@
 	if (iffalse)
 		iffalse = ast_strip_quoted(iffalse, "\"", "\"");
 
-	ast_copy_string(buf, ast_true(expr) ? iftrue : iffalse, len);
+	ast_copy_string(buf, pbx_checkcondition(expr) ? iftrue : iffalse, len);
 
 	return 0;
 }