Fix duplicate values when merging POST data.

Fixes #2648
cakephp · Mar 7, 2012 · 17eb0e4 · 17eb0e4
1 parent 4c6cab0
commit 17eb0e4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/lib/Cake/Network/CakeRequest.php b/lib/Cake/Network/CakeRequest.php
@@ -174,15 +174,15 @@ protected function _processPost() {
 			}
 			unset($this->data['_method']);
 		}
-		$data = $this->data;
+
 		if (isset($this->data['data'])) {
 			$data = $this->data['data'];
-		}
-		if (count($this->data) <= 1) {
-			$this->data = $data;
-		} else {
-			unset($this->data['data']);
-			$this->data = Set::merge($this->data, $data);
+			if (count($this->data) <= 1) {
+				$this->data = $data;
+			} else {
+				unset($this->data['data']);
+				$this->data = Set::merge($this->data, $data);
+			}
 		}
 	}
 

diff --git a/lib/Cake/Test/Case/Network/CakeRequestTest.php b/lib/Cake/Test/Case/Network/CakeRequestTest.php
@@ -204,6 +204,13 @@ public function testPostParsing() {
 		));
 		$request = new CakeRequest('some/path');
 		$this->assertEquals($_POST['data'], $request->data);
+
+		$_POST = array(
+			'a' => array(1, 2),
+			'b' => array(1, 2)
+		);
+		$request = new CakeRequest('some/path');
+		$this->assertEquals($_POST, $request->data);
 	}
 
 /**