From 6f1b39c0b81e70edee6e1021c31058cc8439da83 Mon Sep 17 00:00:00 2001 From: epriestley Date: Fri, 24 Apr 2015 09:11:09 -0700 Subject: [PATCH] Fix call to isGlobalDragAndDropUploadEnabled() from pages with no controller 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 --- src/view/page/PhabricatorStandardPageView.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php index b0852bd0b5..3811427e3f 100644 --- a/src/view/page/PhabricatorStandardPageView.php +++ b/src/view/page/PhabricatorStandardPageView.php @@ -643,13 +643,19 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView { if ($console) { $console_config = $this->getConsoleConfig(); } + + $upload_enabled = false; + if ($controller) { + $upload_enabled = $controller->isGlobalDragAndDropUploadEnabled(); + } + return array( 'title' => $this->getTitle(), 'aphlictDropdownData' => array( $dropdown_query->getNotificationData(), $dropdown_query->getConpherenceData(), ), - 'globalDragAndDrop' => $controller->isGlobalDragAndDropUploadEnabled(), + 'globalDragAndDrop' => $upload_enabled, 'aphlictDropdowns' => $rendered_dropdowns, 'hisecWarningConfig' => $hisec_warning_config, 'consoleConfig' => $console_config,