Page MenuHomePhabricator
Files F15311881

D12572.id30184.diff
No OneTemporary
Actions

D12572.id30184.diff
View Options

diff --git a/src/applications/help/application/PhabricatorHelpApplication.php b/src/applications/help/application/PhabricatorHelpApplication.php
--- a/src/applications/help/application/PhabricatorHelpApplication.php
+++ b/src/applications/help/application/PhabricatorHelpApplication.php
@@ -79,21 +79,19 @@
PhabricatorUser $viewer,
PhabricatorController $controller = null) {
- if (!$controller) {
- return null;
- }
-
- $application = $controller->getCurrentApplication();
- if (!$application) {
- return null;
+ $application = null;
+ if ($controller) {
+ $application = $controller->getCurrentApplication();
}
$view = null;
- $help_items = $application->getHelpMenuItems($viewer);
- if ($help_items) {
- $view = new PHUIListView();
- foreach ($help_items as $item) {
- $view->addMenuItem($item);
+ if ($application) {
+ $help_items = $application->getHelpMenuItems($viewer);
+ if ($help_items) {
+ $view = new PHUIListView();
+ foreach ($help_items as $item) {
+ $view->addMenuItem($item);
+ }
}
}
diff --git a/src/view/page/menu/PhabricatorMainMenuView.php b/src/view/page/menu/PhabricatorMainMenuView.php
--- a/src/view/page/menu/PhabricatorMainMenuView.php
+++ b/src/view/page/menu/PhabricatorMainMenuView.php
@@ -72,6 +72,13 @@
phutil_implode_html(' ', $aural));
}
+ $applications = PhabricatorApplication::getAllInstalledApplications();
+ foreach ($applications as $application) {
+ $menus[] = $application->buildMainMenuExtraNodes(
+ $user,
+ $this->getController());
+ }
+
$application_menu = $this->renderApplicationMenu();
$classes = array();
$classes[] = 'phabricator-main-menu';
@@ -476,13 +483,6 @@
$message_notification_dropdown,
);
- $applications = PhabricatorApplication::getAllInstalledApplications();
- foreach ($applications as $application) {
- $dropdowns[] = $application->buildMainMenuExtraNodes(
- $this->getUser(),
- $this->getController());
- }
-
return array(
array(
$bubble_tag,

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 7, 11:57 AM (4 d, 13 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7223674
Default Alt Text
D12572.id30184.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility