[svn-commits] trunk r27052 - in /trunk: ./ funcs/func_logic.c

[svn-commits at lists.digium.com]

Author: tilghman
Date: Thu May 11 18:16:27 2006
New Revision: 27052

URL: http://svn.digium.com/view/asterisk?rev=27052&view=rev
Log:
Merged revisions 27051 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r27051 | tilghman | 2006-05-11 18:02:57 -0500 (Thu, 11 May 2006) | 2 lines

Bug 7086 - pbx_checkcondition substitution, so that arbitrary strings are true (for regex)

........

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

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

Modified: trunk/funcs/func_logic.c
URL: http://svn.digium.com/view/asterisk/trunk/funcs/func_logic.c?rev=27052&r1=27051&r2=27052&view=diff
==============================================================================
--- trunk/funcs/func_logic.c (original)
+++ trunk/funcs/func_logic.c Thu May 11 18:16:27 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;
 }