From: Automerge script <automerge@asterisk.org>
Date: Fri, 5 May 2006 15:08:18 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.8-netsec~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c40f5053f4b2eba6db5e76b65ad1f2b5b89e404;p=thirdparty%2Fasterisk.git

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 7e7c9141a1..745bf4e365 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 7c98afe807..a0e5ca063e 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);