From: Andrey Kutejko <andy128k@gmail.com>
Date: Sat, 17 Jan 2015 14:43:54 +0000 (+0200)
Subject: correct merge form data
X-Git-Tag: 0.6~66
X-Git-Url: https://git.andy128k.dev/?a=commitdiff_plain;h=c30cb345eaaba082bafc0a048e3f44f99acb0bcc;p=ipf.git

correct merge form data
---

diff --git a/ipf/admin/component.php b/ipf/admin/component.php
index e683531..b69bd46 100644
--- 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 622706f..0fd8fd3 100644
--- 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);
+    }
 }