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)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@27052 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/funcs/func_logic.c b/funcs/func_logic.c
index aebcb4c17cbcf3c501a818b870f42f6a17d90893..1543a27f30361efdb4d320fe2b393bd6a798c9ea 100644 (file)
--- a/funcs/func_logic.c
+++ b/funcs/func_logic.c
@@ -110,7 +110,7 @@ static int acf_if(struct ast_channel *chan, char *cmd, char *data, char *buf,
        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;
 }