From fda920d3adaec61e91e4ab3bce0969c6b6d4562e Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Wed, 9 Mar 2016 09:26:36 +0100 Subject: [PATCH] DirectorObjectForm: inheritance error for arrays --- library/Director/Web/Form/DirectorObjectForm.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/library/Director/Web/Form/DirectorObjectForm.php b/library/Director/Web/Form/DirectorObjectForm.php index 803c0845..6d7fb791 100644 --- a/library/Director/Web/Form/DirectorObjectForm.php +++ b/library/Director/Web/Form/DirectorObjectForm.php @@ -180,6 +180,7 @@ abstract class DirectorObjectForm extends QuickForm $props = $object->getProperties(); unset($props['vars']); } + $this->setDefaults($props); if (! $object instanceof IcingaObject) { @@ -485,7 +486,9 @@ abstract class DirectorObjectForm extends QuickForm } $el->setMultiOptions($multi); } else { - $el->setAttrib('placeholder', $inherited . sprintf($txtInherited, $inheritedFrom)); + if (is_string($inherited)) { + $el->setAttrib('placeholder', $inherited . sprintf($txtInherited, $inheritedFrom)); + } } }