From 84efcb86698a00f863dbdb4cbd4c149c96e498dc Mon Sep 17 00:00:00 2001 From: epriestley Date: Wed, 6 Feb 2013 11:41:57 -0800 Subject: [PATCH] Minor, fix an issue with PhabricatorMenuView and default null keys. This is kind of gross, but breaking some menus right now which end up with double-`''` keys. The current meaning of setKey(null) is different from not calling it (it means `setKey('')`). This should be fixed more reasonably but there's a lot of legacy cruft in PhabricatorSideNavFilterView. Auditors: btrahan --- src/view/layout/PhabricatorMenuView.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/view/layout/PhabricatorMenuView.php b/src/view/layout/PhabricatorMenuView.php index c430fe76fd..ab2a53784c 100644 --- a/src/view/layout/PhabricatorMenuView.php +++ b/src/view/layout/PhabricatorMenuView.php @@ -11,8 +11,11 @@ final class PhabricatorMenuView extends AphrontTagView { public function newLabel($name, $key = null) { $item = id(new PhabricatorMenuItemView()) ->setType(PhabricatorMenuItemView::TYPE_LABEL) - ->setName($name) - ->setKey($key); + ->setName($name); + + if ($key !== null) { + $item->setKey($key); + } $this->addMenuItem($item); @@ -23,8 +26,11 @@ final class PhabricatorMenuView extends AphrontTagView { $item = id(new PhabricatorMenuItemView()) ->setType(PhabricatorMenuItemView::TYPE_LINK) ->setName($name) - ->setHref($href) - ->setKey($key); + ->setHref($href); + + if ($key !== null) { + $key->setKey($key); + } $this->addMenuItem($item);