automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@27085 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 1 insertions, 1 deletions

diff --git a/funcs/func_logic.c b/funcs/func_logic.c
index f748ba939..c8ff599b3 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;
 	}