From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Thu, 11 May 2006 23:16:27 +0000 (+0000)
Subject: Merged revisions 27051 via svnmerge from
X-Git-Tag: 1.4.0-beta1~1383
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9fd91e0829cb228d687d97a0329f36dd010f63b5;p=thirdparty%2Fasterisk.git

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 aebcb4c17c..1543a27f30 100644
--- 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;
 }