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

Merge pull request #3468 from Mikesch-mp/multiline_custom_vars

Browse Source 
Render multiline in custom variables correct.
This commit is contained in:
Eric Lippmann 2018-07-05 13:31:47 +02:00 committed by GitHub
commit 04913f3699
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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)) {