diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-05 15:08:18 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-05 15:08:18 +0000 |
| commit | 9b63351cba4afa77552599b55acb0292541d0448 (patch) | |
| tree | 2ee5135b8927aee00ed2cf0b993a0762d3388f95 /apps | |
| parent | 2339668e53e482a8865b48900add108865b1c290 (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@24875 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_macro.c | 2 | ||||
| -rw-r--r-- | apps/app_while.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_macro.c b/apps/app_macro.c index 7e7c9141a..745bf4e36 100644 --- a/apps/app_macro.c +++ b/apps/app_macro.c @@ -337,7 +337,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); diff --git a/apps/app_while.c b/apps/app_while.c index 7c98afe80..a0e5ca063 100644 --- a/apps/app_while.c +++ b/apps/app_while.c @@ -103,7 +103,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, 1); } else { @@ -269,7 +269,7 @@ static int _while_exec(struct ast_channel *chan, void *data, int end) } - if (!end && !ast_true(condition)) { + if (!end && !pbx_check_condition(condition)) { /* Condition Met (clean up helper vars) */ pbx_builtin_setvar_helper(chan, varname, NULL); pbx_builtin_setvar_helper(chan, my_name, NULL); |