From d97c3c5845cc9c350bad4037250d80166dc8bbed Mon Sep 17 00:00:00 2001 From: markjcrane Date: Sat, 1 Nov 2025 20:33:15 -0600 Subject: [PATCH] Minor fix for switch music on hold class Remove unused text class and unset after return --- .../classes/switch_music_on_hold.php | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) 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 564820442b..2615b9b646 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 @@ -119,7 +119,7 @@ if ($previous_name != $row['music_on_hold_name']) { $name = ''; if (!empty($row['domain_uuid'])) { - $name = $row['domain_name'].'/'; + $name = $row['domain_name'].'/'; } $name .= $row['music_on_hold_name']; $select .= " \n"; @@ -170,21 +170,16 @@ } public function get() { - //add multi-lingual support - $language = new text; - $text = $language->get(null, 'app/music_on_hold'); - //get moh records, build array - $sql = "select "; - $sql .= "d.domain_name, "; - $sql .= "m.* "; - $sql .= "from v_music_on_hold as m "; - $sql .= "left join v_domains as d on d.domain_uuid = m.domain_uuid "; - $sql .= "where (m.domain_uuid = :domain_uuid or m.domain_uuid is null) "; - $sql .= "order by m.domain_uuid desc, music_on_hold_name asc, music_on_hold_rate asc "; - $parameters['domain_uuid'] = $this->domain_uuid; - return $this->database->select($sql, $parameters, 'all'); - unset($sql, $parameters); + $sql = "select "; + $sql .= "d.domain_name, "; + $sql .= "m.* "; + $sql .= "from v_music_on_hold as m "; + $sql .= "left join v_domains as d on d.domain_uuid = m.domain_uuid "; + $sql .= "where (m.domain_uuid = :domain_uuid or m.domain_uuid is null) "; + $sql .= "order by m.domain_uuid desc, music_on_hold_name asc, music_on_hold_rate asc "; + $parameters['domain_uuid'] = $this->domain_uuid; + return $this->database->select($sql, $parameters, 'all'); } public function reload() {