tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-31 01:34:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

ExtensibleSet: do not render empty arrays

Browse Source
This commit is contained in:
Thomas Gelf 2016-03-23 02:23:21 +01:00
parent 69669909c2
commit 5da36490c8
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/Director/IcingaConfig/ExtensibleSet.php
View File

@ -395,7 +395,10 @@ class ExtensibleSet
{ {
$parts = array(); $parts = array();
if ($this->ownValues !== null) { // TODO: It would be nice if we could use empty arrays to override
// inherited ones
// if ($this->ownValues !== null) {
if (!empty($this->ownValues)) {
$parts[] = c::renderKeyValue( $parts[] = c::renderKeyValue(
$key, $key,
$this->renderArray($this->ownValues), $this->renderArray($this->ownValues),
@ -403,7 +406,7 @@ class ExtensibleSet
); );
} }
if (! empty($this->plusValues)) { if (!empty($this->plusValues)) {
$parts[] = c::renderKeyOperatorValue( $parts[] = c::renderKeyOperatorValue(
$key, $key,
'+=', '+=',
@ -412,7 +415,7 @@ class ExtensibleSet
); );
} }
if (! empty($this->minusValues)) { if (!empty($this->minusValues)) {
$parts[] = c::renderKeyOperatorValue( $parts[] = c::renderKeyOperatorValue(
$key, $key,
'-=', '-=',