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

Render multiline in custom variables correct 

Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
This commit is contained in:
Carsten Koebke 2018-06-02 13:48:58 +02:00 committed by Eric Lippmann
parent 10fa64b7e3
commit 55072ac840
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/monitoring/application/views/helpers/Customvar.php
View File

@ -16,11 +16,11 @@ class Zend_View_Helper_Customvar extends Zend_View_Helper_Abstract
public function customvar($struct) public function customvar($struct)
{ {
if (is_scalar($struct)) { if (is_scalar($struct)) {
return $this->view->escape( return $this->view->nl2br($this->view->escape(
is_string($struct) is_string($struct)
? $struct ? $struct
: var_export($struct, true) : var_export($struct, true)
); ));
} elseif (is_array($struct)) { } elseif (is_array($struct)) {
return $this->renderArray($struct); return $this->renderArray($struct);
} elseif (is_object($struct)) { } elseif (is_object($struct)) {