提交 fc0bf672 authored 作者: Anthony Minessale's avatar Anthony Minessale 提交者: Michael Jerris

move nested condition parsing to only happen if main condition was satisfied may…

move nested condition parsing to only happen if main condition was satisfied may alter behaviour see docs and FS-4935
上级 d1a21c8d
......@@ -197,16 +197,6 @@ static int parse_exten(switch_core_session_t *session, switch_caller_profile_t *
do_break_a = NULL;
}
}
if (switch_xml_child(xcond, "condition")) {
if (!(proceed = parse_exten(session, caller_profile, xcond, extension, orig_exten_name, recur + 1))) {
if (do_break_i == BREAK_NEVER) {
continue;
}
goto done;
}
}
if (time_match == 1) {
if ( switch_core_test_flag(SCF_DIALPLAN_TIMESTAMPS) ) {
......@@ -584,6 +574,17 @@ static int parse_exten(switch_core_session_t *session, switch_caller_profile_t *
(anti_action == SWITCH_TRUE && do_break_i == BREAK_ON_FALSE)) || do_break_i == BREAK_ALWAYS) {
break;
}
if (proceed) {
if (switch_xml_child(xcond, "condition")) {
if (!(proceed = parse_exten(session, caller_profile, xcond, extension, orig_exten_name, recur + 1))) {
if (do_break_i == BREAK_NEVER) {
continue;
}
goto done;
}
}
}
}
done:
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论