diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-05 14:47:22 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-05 14:47:22 +0000 |
| commit | a46a4c185c53067a49dd79ce4e09583e5adc7366 (patch) | |
| tree | c8221f15025d5f7a3bbdfabd1d79eacc8edf55e6 /apps/app_while.c | |
| parent | d89f22297792919d548264e9839c134bac8edd19 (diff) | |
Merged revisions 24837 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r24837 | russell | 2006-05-05 10:44:50 -0400 (Fri, 05 May 2006) | 3 lines
use pbx_checkcondition() instead of ast_true() to evaluate the condition
for MacroIf and WhileIf (issue #7086)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@24838 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_while.c')
| -rw-r--r-- | apps/app_while.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_while.c b/apps/app_while.c index 5cdb87db3..7af5f31c0 100644 --- a/apps/app_while.c +++ b/apps/app_while.c @@ -111,7 +111,7 @@ static int execif_exec(struct ast_channel *chan, void *data) { } else mydata = ""; - if (ast_true(expr)) { + if (pbx_checkcondition(expr)) { if ((app = pbx_findapp(myapp))) { res = pbx_exec(chan, app, mydata); } else { @@ -277,12 +277,12 @@ static int _while_exec(struct ast_channel *chan, void *data, int end) } - if ((!end && !ast_true(condition)) || (end == 2)) { + if ((!end && !pbx_check_condition(condition)) || (end == 2)) { /* Condition Met (clean up helper vars) */ const char *goto_str; pbx_builtin_setvar_helper(chan, varname, NULL); pbx_builtin_setvar_helper(chan, my_name, NULL); - snprintf(end_varname,VAR_SIZE,"END_%s",varname); + snprintf(end_varname,VAR_SIZE,"END_%s",varname); if ((goto_str=pbx_builtin_getvar_helper(chan, end_varname))) { pbx_builtin_setvar_helper(chan, end_varname, NULL); ast_parseable_goto(chan, goto_str); |