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

Navigation: Fix accessing a non-existent and static variable 

refs #5600
This commit is contained in:
Johannes Meyer 2015-09-03 12:52:07 +02:00
parent c35db55857
commit c3ad665c15
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/Icinga/Web/Navigation/Navigation.php
View File

@ -132,10 +132,11 @@ class Navigation implements ArrayAccess, Countable, IteratorAggregate
} }
$itemType = isset($properties['type']) ? String::cname($properties['type'], '-') : 'NavigationItem'; $itemType = isset($properties['type']) ? String::cname($properties['type'], '-') : 'NavigationItem';
if (! empty($this->types) && isset($this->types[$itemType])) { if (! empty(static::$types) && isset(static::$types[$itemType])) {
return new $this->types[$itemType]($name, $properties); return new static::$types[$itemType]($name, $properties);
} }
$item = null;
foreach (Icinga::app()->getModuleManager()->getLoadedModules() as $module) { foreach (Icinga::app()->getModuleManager()->getLoadedModules() as $module) {
$classPath = 'Icinga\\Module\\' . $module->getName() . '\\' . static::NAVIGATION_NS . '\\' . $itemType; $classPath = 'Icinga\\Module\\' . $module->getName() . '\\' . static::NAVIGATION_NS . '\\' . $itemType;
if (class_exists($classPath)) { if (class_exists($classPath)) {
@ -159,11 +160,11 @@ class Navigation implements ArrayAccess, Countable, IteratorAggregate
); );
$item = new NavigationItem($name, $properties); $item = new NavigationItem($name, $properties);
$this->types[$itemType] = 'Icinga\\Web\\Navigation\\NavigationItem'; static::$types[$itemType] = 'Icinga\\Web\\Navigation\\NavigationItem';
} elseif (! $item instanceof NavigationItem) { } elseif (! $item instanceof NavigationItem) {
throw new ProgrammingError('Class %s must inherit from NavigationItem', $classPath); throw new ProgrammingError('Class %s must inherit from NavigationItem', $classPath);
} else { } else {
$this->types[$itemType] = $classPath; static::$types[$itemType] = $classPath;
} }
return $item; return $item;