automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@24875 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_macro.c b/apps/app_macro.c
index 7e7c9141a163e903f8c8f72c532497a96a13a277..745bf4e3652f2108dc59207000b3707d3bd4318f 100644 (file)
--- 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 7c98afe807ab25c434f2821fa1cca51758a4ce12..a0e5ca063e529ce801fcc183a26f867165f132f8 100644 (file)
--- 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);