From: Automerge script <automerge@asterisk.org>
Date: Fri, 12 May 2006 00:05:45 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.8-netsec~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a84ea4f014b81c5a3bcca6bddcfcd329f912210d;p=thirdparty%2Fasterisk.git

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 f748ba9390..c8ff599b3d 100644
--- 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;
 	}