revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-10 08:52:39 +01:00
Code Issues Releases Wiki Activity

Don't run "aphlict-listen" behavior if real-time notifications are disabled

Browse source 
Summary: Fixes T5277. We incorrectly ran this unconditionally.

Test Plan: Toggled setting on/off, verified behavior ran or did not run.

Reviewers: joshuaspence

Reviewed By: joshuaspence

Subscribers: epriestley

Maniphest Tasks: T5277

Differential Revision: https://secure.phabricator.com/D9418
This commit is contained in:
epriestley 2014-06-07 13:05:01 -07:00
parent 61af2e313b
commit 96d5a9b4c2
1 changed files with 38 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/view/page/PhabricatorStandardPageView.php
View file

@ -352,7 +352,11 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView {
$request = $this->getRequest(); $request = $this->getRequest();
$user = $request->getUser(); $user = $request->getUser();
$container = null; $tail = array(
parent::getTail(),
);
if (PhabricatorEnv::getEnvConfig('notification.enabled')) {
if ($user && $user->isLoggedIn()) { if ($user && $user->isLoggedIn()) {
$aphlict_object_id = celerity_generate_unique_node_id(); $aphlict_object_id = celerity_generate_unique_node_id();
@ -377,7 +381,8 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView {
'debug' => $enable_debug, 'debug' => $enable_debug,
'pageObjects' => array_fill_keys($this->pageObjects, true), 'pageObjects' => array_fill_keys($this->pageObjects, true),
)); ));
$container = phutil_tag(
$tail[] = phutil_tag(
'div', 'div',
array( array(
'id' => $aphlict_container_id, 'id' => $aphlict_container_id,
@ -386,16 +391,12 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView {
), ),
''); '');
} }
}
$response = CelerityAPI::getStaticResourceResponse(); $response = CelerityAPI::getStaticResourceResponse();
$tail[] = $response->renderHTMLFooter();
$tail = array( return $tail;
parent::getTail(),
$container,
$response->renderHTMLFooter(),
);
return phutil_implode_html("\n", $tail);
} }
protected function getBodyClasses() { protected function getBodyClasses() {