archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Minor, unfatal the 404 page after new menu stuff.

Browse Source
This commit is contained in:
epriestley
2012-12-07 15:29:41 -08:00
parent 7b5dea94d2
commit 2763d0fe61
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/view/page/PhabricatorStandardPageView.php
View File

@@ -154,9 +154,12 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView {
$menu = id(new PhabricatorMainMenuView()) $menu = id(new PhabricatorMainMenuView())
->setUser($request->getUser()) ->setUser($request->getUser())
->setController($this->getController())
->setDefaultSearchScope($this->getSearchDefaultScope()); ->setDefaultSearchScope($this->getSearchDefaultScope());
if ($this->getController()) {
$menu->setController($this->getController());
}
if ($this->getApplicationMenu()) { if ($this->getApplicationMenu()) {
$menu->setApplicationMenu($this->getApplicationMenu()); $menu->setApplicationMenu($this->getApplicationMenu());
} }

2
src/view/page/menu/PhabricatorMainMenuView.php
View File

@@ -222,7 +222,7 @@ final class PhabricatorMainMenuView extends AphrontView {
->setName(pht('Phabricator Home')) ->setName(pht('Phabricator Home'))
->setHref('/') ->setHref('/')
->appendChild($this->renderMenuIcon('logo-light-large'))); ->appendChild($this->renderMenuIcon('logo-light-large')));
if ($controller->getCurrentApplication()) { if ($controller && $controller->getCurrentApplication()) {
$application = $controller->getCurrentApplication(); $application = $controller->getCurrentApplication();
$icon = $application->getIconName().'-light-large'; $icon = $application->getIconName().'-light-large';
$view->addMenuItem( $view->addMenuItem(