From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Tue, 10 Oct 2006 16:46:01 +0000 (+0000)
Subject: Merged revisions 44808 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~4455
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ca7c56c7414ea752cd7726b54eef9f15555c791;p=thirdparty%2Fasterisk.git

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

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