From e9a6449b07999e8089f151038208779995a4e379 Mon Sep 17 00:00:00 2001 From: fusionate Date: Fri, 11 Dec 2020 16:36:51 -0700 Subject: [PATCH] Time Conditions: Fix dynamic Destination Other > Hangup option. --- app/time_conditions/time_condition_edit.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/time_conditions/time_condition_edit.php b/app/time_conditions/time_condition_edit.php index 957c5cb812..40ecd31b09 100644 --- a/app/time_conditions/time_condition_edit.php +++ b/app/time_conditions/time_condition_edit.php @@ -562,7 +562,11 @@ $sql .= " ) "; $sql .= " or ( "; $sql .= " dialplan_detail_tag = 'action' "; - $sql .= " and dialplan_detail_data not like 'preset=%' "; + $sql .= " and "; + $sql .= " ( "; + $sql .= " dialplan_detail_data not like 'preset=%' "; + $sql .= " or dialplan_detail_data is null "; + $sql .= " ) "; $sql .= " ) "; $sql .= ") "; $sql .= "order by dialplan_detail_group asc, dialplan_detail_order asc"; @@ -578,10 +582,10 @@ foreach ($dialplan_details as $row) { if ($row['dialplan_detail_tag'] == 'action') { if ($row['dialplan_detail_group'] == '999') { - $dialplan_anti_action = $row['dialplan_detail_type'].(($row['dialplan_detail_data'] != '') ? ':'.$row['dialplan_detail_data'] : null); + $dialplan_anti_action = $row['dialplan_detail_type'].($row['dialplan_detail_data'] != '' || $row['dialplan_detail_type'] == 'hangup' ? ':'.$row['dialplan_detail_data'] : null); } else { - $dialplan_actions[$row['dialplan_detail_group']] = $row['dialplan_detail_type'].(($row['dialplan_detail_data'] != '') ? ':'.$row['dialplan_detail_data'] : null); + $dialplan_actions[$row['dialplan_detail_group']] = $row['dialplan_detail_type'].($row['dialplan_detail_data'] != '' || $row['dialplan_detail_type'] == 'hangup' ? ':'.$row['dialplan_detail_data'] : null); } } else if ($row['dialplan_detail_tag'] == 'condition') {