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/branches/1.4@44808 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/funcs/func_logic.c b/funcs/func_logic.c
index 9fe23b20b243a2cf0e201b35f2cd611b6ada5664..daf50142f7b4cc44f82a3e157f557c75865a69ef 100644 (file)
--- 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;
 }