tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-04-07 21:05:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

NavigationItem: Catch exceptions thrown in __toString()

Browse Source 
refs #5600
This commit is contained in:
Johannes Meyer 2015-09-02 15:16:05 +02:00
parent 95a3f1c011
commit c03109c4c6
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,9 +4,11 @@
namespace Icinga\Web\Navigation;
use Countable;
use Exception;
use InvalidArgumentException;
use IteratorAggregate;
use Icinga\Application\Icinga;
use Icinga\Exception\IcingaException;
use Icinga\Web\View;
use Icinga\Web\Url;
@ -451,18 +453,20 @@ class NavigationItem implements Countable, IteratorAggregate
}
/**
* Render the navigation item to HTML
* Return this item rendered to HTML
*
* @return string
* @return string
*/
public function render()
{
$view = $this->getView();
$label = $view->escape($this->getLabel());
if (null !== $icon = $this->getIcon()) {
if (($icon = $this->getIcon()) !== null) {
$label = $view->icon($icon) . $label;
}
if (null !== $url = $this->getUrl()) {
if (($url = $this->getUrl()) !== null) {
$content = sprintf(
'<a%s href="%s">%s</a>',
$view->propertiesToString($this->getAttributes()),
@ -477,16 +481,21 @@ class NavigationItem implements Countable, IteratorAggregate
$label
);
}
return $content;
}
/**
* Render the navigation item to HTML
* Return this item rendered to HTML
*
* @return string
* @return string
*/
public function __toString()
{
return $this->render();
try {
return $this->render();
} catch (Exception $e) {
return IcingaException::describe($e);
}
}
}