Navigation: Fix method getActiveItem() failing badly for empty navigations

refs #5600
This commit is contained in:
Johannes Meyer 2015-09-07 08:37:06 +02:00
parent 6dd49761ff
commit a3539b0817

View File

@ -228,14 +228,14 @@ class Navigation implements ArrayAccess, Countable, IteratorAggregate
*/ */
public function getActiveItem() public function getActiveItem()
{ {
$firstItem = reset($this->items);
foreach ($this->items as $item) { foreach ($this->items as $item) {
if ($item->getActive()) { if ($item->getActive()) {
return $item; return $item;
} }
} }
return $firstItem->setActive(); $firstItem = reset($this->items);
return $firstItem ? $firstItem->setActive() : null;
} }
/** /**