tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Menu: Don't render sub menus when a dot appears in the label 

I guess this was intended to be a feature. Turns out to be a bug though :)

fixes #7772
This commit is contained in:
Eric Lippmann 2014-11-21 17:39:18 +01:00
parent d84318d8b8
commit eed10159fd
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
library/Icinga/Web/Menu.php
View File

@ -437,21 +437,8 @@ class Menu implements RecursiveIterator
*/ */
public function addSubMenu($id, ConfigObject $menuConfig = null) public function addSubMenu($id, ConfigObject $menuConfig = null)
{ {
if (false === ($pos = strpos($id, '.'))) { $subMenu = new static($id, $menuConfig, $this);
$subMenu = new static($id, $menuConfig, $this); $this->subMenus[$id] = $subMenu;
$this->subMenus[$id] = $subMenu;
} else {
list($parentId, $id) = explode('.', $id, 2);
if ($this->hasSubMenu($parentId)) {
$parent = $this->getSubMenu($parentId);
} else {
$parent = $this->addSubMenu($parentId);
}
$subMenu = $parent->addSubMenu($id, $menuConfig);
}
return $subMenu; return $subMenu;
} }