revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-19 03:50:54 +01:00
Code Issues Releases Wiki Activity

Fix call to isGlobalDragAndDropUploadEnabled() from pages with no controller

Browse source 
Summary: Fixes T7902. Some kinds of error pages, including the 404 page, may not have a controller when they reach this method.

Test Plan: Hit 404 page.

Reviewers: btrahan

Reviewed By: btrahan

Subscribers: epriestley

Maniphest Tasks: T7902

Differential Revision: https://secure.phabricator.com/D12538
This commit is contained in:
epriestley 2015-04-24 09:11:09 -07:00
parent cdb8ea27e5
commit 6f1b39c0b8
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -643,13 +643,19 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView {
if ($console) { if ($console) {
$console_config = $this->getConsoleConfig(); $console_config = $this->getConsoleConfig();
} }
$upload_enabled = false;
if ($controller) {
$upload_enabled = $controller->isGlobalDragAndDropUploadEnabled();
}
return array( return array(
'title' => $this->getTitle(), 'title' => $this->getTitle(),
'aphlictDropdownData' => array( 'aphlictDropdownData' => array(
$dropdown_query->getNotificationData(), $dropdown_query->getNotificationData(),
$dropdown_query->getConpherenceData(), $dropdown_query->getConpherenceData(),
), ),
'globalDragAndDrop' => $controller->isGlobalDragAndDropUploadEnabled(), 'globalDragAndDrop' => $upload_enabled,
'aphlictDropdowns' => $rendered_dropdowns, 'aphlictDropdowns' => $rendered_dropdowns,
'hisecWarningConfig' => $hisec_warning_config, 'hisecWarningConfig' => $hisec_warning_config,
'consoleConfig' => $console_config, 'consoleConfig' => $console_config,