diff --git a/src/applications/auth/application/PhabricatorApplicationAuth.php b/src/applications/auth/application/PhabricatorApplicationAuth.php index 8df53a63f1..0e56395ab7 100644 --- a/src/applications/auth/application/PhabricatorApplicationAuth.php +++ b/src/applications/auth/application/PhabricatorApplicationAuth.php @@ -21,12 +21,13 @@ final class PhabricatorApplicationAuth extends PhabricatorApplication { $items = array(); if ($user->isLoggedIn()) { - $item = new PHUIListItemView(); - $item->setName(pht('Log Out')); - $item->setIcon('power'); - $item->setWorkflow(true); - $item->setHref('/logout/'); - $item->setSelected(($controller instanceof PhabricatorLogoutController)); + $item = id(new PHUIListItemView()) + ->addClass('core-menu-item') + ->setName(pht('Log Out')) + ->setIcon('power') + ->setWorkflow(true) + ->setHref('/logout/') + ->setSelected(($controller instanceof PhabricatorLogoutController)); $items[] = $item; } diff --git a/src/applications/base/controller/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php index 8d3e8c97cd..b6192d54ac 100644 --- a/src/applications/base/controller/PhabricatorController.php +++ b/src/applications/base/controller/PhabricatorController.php @@ -224,6 +224,7 @@ abstract class PhabricatorController extends AphrontController { $view->appendChild(hsprintf( '
%s
', $response->buildResponseString())); + $view->setDust(true); $response = new AphrontWebpageResponse(); $response->setContent($view->render()); return $response; diff --git a/src/view/page/menu/PhabricatorMainMenuView.php b/src/view/page/menu/PhabricatorMainMenuView.php index 49498a18fe..4734d5be69 100644 --- a/src/view/page/menu/PhabricatorMainMenuView.php +++ b/src/view/page/menu/PhabricatorMainMenuView.php @@ -146,11 +146,9 @@ final class PhabricatorMainMenuView extends AphrontView { $actions = array(); foreach ($applications as $application) { - if ($application->shouldAppearInLaunchView()) { - $app_actions = $application->buildMainMenuItems($user, $controller); - foreach ($app_actions as $action) { - $actions[] = $action; - } + $app_actions = $application->buildMainMenuItems($user, $controller); + foreach ($app_actions as $action) { + $actions[] = $action; } } @@ -181,15 +179,6 @@ final class PhabricatorMainMenuView extends AphrontView { } } - if ($user->isLoggedIn()) { - $view->addMenuItem( - id(new PHUIListItemView()) - ->addClass('core-menu-item') - ->setName(pht('Log Out')) - ->setHref('/logout/') - ->appendChild($this->renderMenuIcon('power-light-large'))); - } - return $view; }