From c5e1e2f36fe37a9d03445a2c060e70b28cfaf38c Mon Sep 17 00:00:00 2001 From: Mafoo Date: Wed, 8 Jun 2016 22:40:05 +0100 Subject: [PATCH] BugFix-Double default moh (#1639) because app_defaults now deals with detecting the default music we don't need to forcefully put it on the list if default is detected name it using the $text['opt-default'] --- app/music_on_hold/resources/classes/switch_music_on_hold.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/music_on_hold/resources/classes/switch_music_on_hold.php b/app/music_on_hold/resources/classes/switch_music_on_hold.php index 4895bea87d..26eadefe19 100644 --- a/app/music_on_hold/resources/classes/switch_music_on_hold.php +++ b/app/music_on_hold/resources/classes/switch_music_on_hold.php @@ -98,7 +98,6 @@ include "root.php"; $language = new text; $text = $language->get(null, 'app/music_on_hold'); - $moh_list[''] = $text['opt-default']; $music_on_hold_dir = $_SESSION["switch"]["sounds"]["dir"]."/music"; $array = array_merge(glob($music_on_hold_dir."/*/*", GLOB_ONLYDIR), glob($music_on_hold_dir."/".$_SESSION['domain_name']."/*/*", GLOB_ONLYDIR)); foreach($array as $moh_dir) { @@ -121,6 +120,9 @@ include "root.php"; else { $moh_value = "local_stream://".$moh_name; } + if($moh_name == 'default') { + $moh_name = $text['opt-default']; + } $moh_list[$moh_value] = str_replace('_', ' ', $moh_name); } return $moh_list;