From 1d89c1ed24aee9183e9e66305c93f595b723c71d Mon Sep 17 00:00:00 2001 From: Chad Little Date: Fri, 19 May 2017 21:40:08 -0700 Subject: [PATCH] (stable) Add sound to logged out Conpherence Summary: Fixes T12735. Adds a sound if the user is logged out, skips checking a setting. Test Plan: set participants to null and verify sound plays, no exceptions1111 Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Maniphest Tasks: T12735 Differential Revision: https://secure.phabricator.com/D17973 --- .../controller/ConpherenceUpdateController.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/applications/conpherence/controller/ConpherenceUpdateController.php b/src/applications/conpherence/controller/ConpherenceUpdateController.php index a814c64452..a792a5a4d4 100644 --- a/src/applications/conpherence/controller/ConpherenceUpdateController.php +++ b/src/applications/conpherence/controller/ConpherenceUpdateController.php @@ -369,9 +369,17 @@ final class ConpherenceUpdateController ->setViewer($user); $dropdown_query->execute(); - $sounds = $this->getSoundForParticipant($user, $participant); - $receive_sound = $sounds[ConpherenceRoomSettings::SOUND_RECEIVE]; - $mention_sound = $sounds[ConpherenceRoomSettings::SOUND_MENTION]; + $map = ConpherenceRoomSettings::getSoundMap(); + $default_receive = ConpherenceRoomSettings::DEFAULT_RECEIVE_SOUND; + $receive_sound = $map[$default_receive]['rsrc']; + $mention_sound = null; + + // Get the user's defaults if logged in + if ($participant) { + $sounds = $this->getSoundForParticipant($user, $participant); + $receive_sound = $sounds[ConpherenceRoomSettings::SOUND_RECEIVE]; + $mention_sound = $sounds[ConpherenceRoomSettings::SOUND_MENTION]; + } $content = array( 'non_update' => $non_update,