diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-10 16:46:01 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-10 16:46:01 +0000 |
| commit | dced8f07fdfc39960f5b7862f830fc387a04a788 (patch) | |
| tree | 1581dbedf50136cfc440fce3cc6f8501c678e13d /funcs/func_logic.c | |
| parent | 7c06b51fea2a7afe7d359346eca38a4c47952915 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@44810 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs/func_logic.c')
| -rw-r--r-- | funcs/func_logic.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |