automerge commit

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

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;
 	}