kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-19 00:00:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@24875 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-05-05 15:08:18 +00:00
parent b4c09a0b95
commit 5c40f5053f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app_macro.c
View File

@@ -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);

4
apps/app_while.c
View File

@@ -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);