correct merge form data

diff --git a/ipf/admin/component.php b/ipf/admin/component.php
index e6835316d9a929c55ededc377c7639497653787b..b69bd46ba2685579e868c617f50f4e468f97e4ff 100644 (file)
--- a/ipf/admin/component.php
+++ b/ipf/admin/component.php
@@ -174,7 +174,7 @@ abstract class IPF_Admin_Component
     {
         $errors = false;
         if ($this->request->method == 'POST') {
-            $form = $this->_getAddForm(null, $this->request->POST + $this->request->FILES);
+            $form = $this->_getAddForm(null, $this->request->getFormData());
             $this->_setupAddForm($form);
 
             if ($form->isValid()) {
@@ -233,7 +233,7 @@ abstract class IPF_Admin_Component
 
         $errors = false;
         if ($this->request->method == 'POST') {
-            $form = $this->_getEditForm($object, $this->request->POST + $this->request->FILES);
+            $form = $this->_getEditForm($object, $this->request->getFormData());
             $this->_setupEditForm($form);
 
             if ($form->isValid()) {

diff --git a/ipf/http/request.php b/ipf/http/request.php
index 622706f1e0ab5e52fe7155f274d930a2050d41ee..0fd8fd37c3d7bbe29a5c833fe71537dfc2837a52 100644 (file)
--- a/ipf/http/request.php
+++ b/ipf/http/request.php
@@ -64,5 +64,10 @@ class IPF_HTTP_Request
     {
         return file_get_contents('php://input');
     }
+
+    public function getFormData()
+    {
+        return array_merge_recursive($this->POST, $this->FILES);
+    }
 }