[svn-commits] branch jcollie/bug7057 r27091 - in /team/jcollie/bug7057: ./ funcs/func_logic.c

[svn-commits at lists.digium.com]

Author: jcollie
Date: Fri May 12 22:27:57 2006
New Revision: 27091

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

................
r27052 | tilghman | 2006-05-11 18:16:27 -0500 (Thu, 11 May 2006) | 10 lines

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:
    team/jcollie/bug7057/   (props changed)
    team/jcollie/bug7057/funcs/func_logic.c

Propchange: team/jcollie/bug7057/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/jcollie/bug7057/
------------------------------------------------------------------------------
    automerge-email = jeff at ocjtech.us

Propchange: team/jcollie/bug7057/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri May 12 22:27:57 2006
@@ -1,1 +1,1 @@
-/trunk:1-27027
+/trunk:1-27090

Modified: team/jcollie/bug7057/funcs/func_logic.c
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7057/funcs/func_logic.c?rev=27091&r1=27090&r2=27091&view=diff
==============================================================================
--- team/jcollie/bug7057/funcs/func_logic.c (original)
+++ team/jcollie/bug7057/funcs/func_logic.c Fri May 12 22:27:57 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;
 }