From f3e74f0f24fa6973c20f62007ae09233098c72d0 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Mon, 1 Sep 2014 09:44:04 +0200 Subject: [PATCH] library/form: Append class 'autosubmit' in case the element to autosubmit has the class attribute set Before, the class attribute would've been overwritten. refs #5525 --- library/Icinga/Web/Form.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php index f47a42d9a..f4acaa5f1 100644 --- a/library/Icinga/Web/Form.php +++ b/library/Icinga/Web/Form.php @@ -370,7 +370,15 @@ class Form extends Zend_Form if ($el->getAttrib('autosubmit')) { // Need to add this decorator first or it interferes with the other's two HTML otherwise $el->addDecorator(new NoScriptApply()); // Non-JS environments - $el->setAttrib('class', 'autosubmit'); // JS environments + $class = $el->getAttrib('class'); + if (is_array($class)) { + $class[] = 'autosubmit'; + } elseif ($class === null) { + $class = 'autosubmit'; + } else { + $class .= ' autosubmit'; + } + $el->setAttrib('class', $class); // JS environments unset($el->autosubmit); }