From e5d3295975713dc1cddfed2dd6ddb7028dc7bf89 Mon Sep 17 00:00:00 2001
From: agree <37550360+greenbea@users.noreply.github.com>
Date: Wed, 24 Jun 2020 18:42:03 -0400
Subject: [PATCH] Fix destination->valid method for ivr (#5312)

* Update destinations.php

* Update ivr_menu_edit.php
---
 app/destinations/resources/classes/destinations.php | 2 +-
 app/ivr_menus/ivr_menu_edit.php                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/destinations/resources/classes/destinations.php b/app/destinations/resources/classes/destinations.php
index 4b81f8bac2..a17f22cb64 100644
--- a/app/destinations/resources/classes/destinations.php
+++ b/app/destinations/resources/classes/destinations.php
@@ -551,7 +551,7 @@ if (!class_exists('destinations')) {
 		* valid destination
 		*/
 		public function valid($destination, $type = 'dialplan') {
-			$destinations = $this->all('dialplan');
+			$destinations = $this->all($type);
 			foreach($destinations as $category => $array) {
 				if (is_array($array)) {
 					foreach ($array as $key => $value) {
diff --git a/app/ivr_menus/ivr_menu_edit.php b/app/ivr_menus/ivr_menu_edit.php
index f1b876ac9f..a45b7c0a94 100644
--- a/app/ivr_menus/ivr_menu_edit.php
+++ b/app/ivr_menus/ivr_menu_edit.php
@@ -308,7 +308,7 @@
 							$array['ivr_menus'][0]['ivr_menu_options'][$y]["ivr_menu_option_uuid"] = $ivr_menu_option_uuid;
 							$array['ivr_menus'][0]['ivr_menu_options'][$y]["ivr_menu_option_digits"] = $row["ivr_menu_option_digits"];
 							$array['ivr_menus'][0]['ivr_menu_options'][$y]["ivr_menu_option_action"] = $ivr_menu_option_action;
-							if ($destination->valid(preg_replace('/\s/', ':', $ivr_menu_option_param, 1), 'ivr')) {
+							if ($destination->valid($ivr_menu_option_action.":".$ivr_menu_option_param, 'ivr')) {
 								$array['ivr_menus'][0]['ivr_menu_options'][$y]["ivr_menu_option_param"] = $ivr_menu_option_param;
 							}
 							$array['ivr_menus'][0]['ivr_menu_options'][$y]["ivr_menu_option_order"] = $row["ivr_menu_option_order"];