revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-15 18:10:53 +01:00
Code Issues Releases Wiki Activity

(stable) Add sound to logged out Conpherence

Browse source 
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
This commit is contained in:
Chad Little 2017-05-19 21:40:08 -07:00 committed by epriestley
parent 88935dec13
commit 1d89c1ed24
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/applications/conpherence/controller/ConpherenceUpdateController.php
View file

@ -369,9 +369,17 @@ final class ConpherenceUpdateController
->setViewer($user); ->setViewer($user);
$dropdown_query->execute(); $dropdown_query->execute();
$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); $sounds = $this->getSoundForParticipant($user, $participant);
$receive_sound = $sounds[ConpherenceRoomSettings::SOUND_RECEIVE]; $receive_sound = $sounds[ConpherenceRoomSettings::SOUND_RECEIVE];
$mention_sound = $sounds[ConpherenceRoomSettings::SOUND_MENTION]; $mention_sound = $sounds[ConpherenceRoomSettings::SOUND_MENTION];
}
$content = array( $content = array(
'non_update' => $non_update, 'non_update' => $non_update,