Form: Return values as null if element has "ignore" and "preserveDefa…

…ult" refs #12295
Icinga · Jan 9, 2017 · 277f4b0 · 277f4b0
1 parent 1129a29
commit 277f4b0
Showing 1 changed file with 24 additions and 0 deletions.
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
@@ -1276,6 +1276,30 @@ public function isValid($formData)
         return parent::isValid($formData);
     }
 
+    public function getValues($suppressArrayNotation = false)
+    {
+        $values = parent::getValues($suppressArrayNotation);
+        $eBelongTo = null;
+
+        if ($this->isArray()) {
+            $eBelongTo = $this->getElementsBelongTo();
+        }
+
+        foreach ($this->getElements() as $key => $element) {
+            if ($element->getIgnore() && $element->getDecorator('preserveDefault')) {
+                if (($belongsTo = $element->getBelongsTo()) !== $eBelongTo) {
+                    if ('' !== (string)$belongsTo) {
+                        $key = $belongsTo . '[' . $key . ']';
+                    }
+                }
+                $merge = $this->_attachToArray(null, $key);
+                $values = $this->_array_replace_recursive($values, $merge);
+            }
+        }
+
+        return $values;
+    }
+
     /**
      * Remove all elements of this form
      *