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_macro.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_macro.c')
| -rw-r--r-- | apps/app_macro.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_macro.c b/apps/app_macro.c index fb3290fc1..b09df9528 100644 --- a/apps/app_macro.c +++ b/apps/app_macro.c @@ -326,7 +326,7 @@ static int macroif_exec(struct ast_channel *chan, void *data) *label_b = '\0'; label_b++; } - if (ast_true(expr)) + if (pbx_checkcondition(expr)) macro_exec(chan, label_a); else if (label_b) macro_exec(chan, label_b); |