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

DirectorObjectForm: inheritance error for arrays

Browse Source
This commit is contained in:
Thomas Gelf 2016-03-09 09:26:36 +01:00
parent a94843ef12
commit fda920d3ad
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/Director/Web/Form/DirectorObjectForm.php
View File

@ -180,6 +180,7 @@ abstract class DirectorObjectForm extends QuickForm
$props = $object->getProperties(); $props = $object->getProperties();
unset($props['vars']); unset($props['vars']);
} }
$this->setDefaults($props); $this->setDefaults($props);
if (! $object instanceof IcingaObject) { if (! $object instanceof IcingaObject) {
@ -485,7 +486,9 @@ abstract class DirectorObjectForm extends QuickForm
} }
$el->setMultiOptions($multi); $el->setMultiOptions($multi);
} else { } else {
$el->setAttrib('placeholder', $inherited . sprintf($txtInherited, $inheritedFrom)); if (is_string($inherited)) {
$el->setAttrib('placeholder', $inherited . sprintf($txtInherited, $inheritedFrom));
}
} }
} }