From 9ca7c56c7414ea752cd7726b54eef9f15555c791 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Tue, 10 Oct 2006 16:46:01 +0000 Subject: Merged revisions 44808 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r44808 | tilghman | 2006-10-10 11:42:19 -0500 (Tue, 10 Oct 2006) | 2 lines Lost of a bit of logic when this was simplified between 1.2 and 1.4 (Bug 8117) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44810 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- funcs/func_logic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/funcs/func_logic.c b/funcs/func_logic.c index 9fe23b20b..daf50142f 100644 --- a/funcs/func_logic.c +++ b/funcs/func_logic.c @@ -111,7 +111,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, pbx_checkcondition(expr) ? iftrue : iffalse, len); + ast_copy_string(buf, pbx_checkcondition(expr) ? (S_OR(iftrue, "")) : (S_OR(iffalse, "")), len); return 0; } -- cgit v1.2.3