NavigationItem: Return the name if no label is set in getLabel()

refs #5600
This commit is contained in:
Johannes Meyer 2015-09-02 15:27:34 +02:00
parent 1ef4a2f7d0
commit e2beb7d027
1 changed files with 7 additions and 7 deletions

View File

@ -62,9 +62,9 @@ class NavigationItem implements Countable, IteratorAggregate
protected $name; protected $name;
/** /**
* Label * This item's label
* *
* @var string|null * @var string
*/ */
protected $label; protected $label;
@ -327,17 +327,17 @@ class NavigationItem implements Countable, IteratorAggregate
} }
/** /**
* Get the label * Return this item's label
* *
* @return string|null * @return string
*/ */
public function getLabel() public function getLabel()
{ {
return $this->label; return $this->label ?: $this->getName();
} }
/** /**
* Set the label * Set this item's label
* *
* @param string $label * @param string $label
* *
@ -345,7 +345,7 @@ class NavigationItem implements Countable, IteratorAggregate
*/ */
public function setLabel($label) public function setLabel($label)
{ {
$this->label = (string) $label; $this->label = $label;
return $this; return $this;
} }