Fix exception when a module has no menu configuration

This commit is contained in:
Johannes Meyer 2014-01-29 12:09:35 +01:00
parent 0b28bd31e5
commit f4a00d24e5

View File

@ -45,7 +45,10 @@ class Menu extends MenuItem
$manager = Icinga::app()->getModuleManager(); $manager = Icinga::app()->getModuleManager();
$menuConfigs = array(Config::app('menu')); $menuConfigs = array(Config::app('menu'));
foreach ($manager->listEnabledModules() as $moduleName) { foreach ($manager->listEnabledModules() as $moduleName) {
$menuConfigs[] = Config::module($moduleName, 'menu'); $moduleMenuConfig = Config::module($moduleName, 'menu');
if ($moduleMenuConfig) {
$menuConfigs[] = $moduleMenuConfig;
}
} }
return $menu->loadMenuItems($menu->flattenConfigs($menuConfigs)); return $menu->loadMenuItems($menu->flattenConfigs($menuConfigs));
} }