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

NavigationItem: Initialize $children before setting the properties 

refs #5600
This commit is contained in:
Johannes Meyer 2015-09-02 15:20:26 +02:00
parent 62f7a49a45
commit c9050e2f21
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
library/Icinga/Web/Navigation/NavigationItem.php
View File

@ -41,7 +41,7 @@ class NavigationItem implements Countable, IteratorAggregate
protected $attributes = array(); protected $attributes = array();
/** /**
* Item's children * This item's children
* *
* @var Navigation * @var Navigation
*/ */
@ -105,16 +105,17 @@ class NavigationItem implements Countable, IteratorAggregate
public function __construct($name, array $properties = null) public function __construct($name, array $properties = null)
{ {
$this->setName($name); $this->setName($name);
$this->children = new Navigation();
if (! empty($properties)) { if (! empty($properties)) {
$this->setProperties($properties); $this->setProperties($properties);
} }
$this->children = new Navigation();
$this->init(); $this->init();
} }
/** /**
* Initialize the navigation item * Initialize this NavigationItem
*/ */
public function init() public function init()
{ {
@ -126,7 +127,7 @@ class NavigationItem implements Countable, IteratorAggregate
*/ */
public function count() public function count()
{ {
return $this->children->count(); return $this->getChildren()->count();
} }
/** /**
@ -134,7 +135,7 @@ class NavigationItem implements Countable, IteratorAggregate
*/ */
public function getIterator() public function getIterator()
{ {
return $this->children; return $this->getChildren();
} }
/** /**
@ -253,13 +254,13 @@ class NavigationItem implements Countable, IteratorAggregate
} }
/** /**
* Get whether the item has children * Return whether this item has any children
* *
* @return bool * @return bool
*/ */
public function hasChildren() public function hasChildren()
{ {
return ! $this->children->isEmpty(); return ! $this->getChildren()->isEmpty();
} }
/** /**