automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@27085 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/funcs/func_logic.c b/funcs/func_logic.c
index f748ba93906e0677ebd9b836dad1483b5d2b8b06..c8ff599b3d476d9035a456eabeb2e8a21ca002cb 100644 (file)
--- a/funcs/func_logic.c
+++ b/funcs/func_logic.c
@@ -115,7 +115,7 @@ static char *builtin_function_if(struct ast_channel *chan, char *cmd, char *data
        if (iffalse)
                iffalse = ast_strip_quoted(iffalse, "\"", "\"");
 
-       if ((ret = ast_true(expr) ? iftrue : iffalse)) {
+       if ((ret = pbx_checkcondition(expr) ? iftrue : iffalse)) {
                ast_copy_string(buf, ret, len);
                ret = buf;
        }