Merge pull request #5531 from tianhe1986/develop_input_array_notation

Input: considering nested array keys in `get_post` and `post_get`

2 files changed, 38 insertions, 6 deletions

diff --git a/system/core/Input.php b/system/core/Input.php
index 34f080899..7f5f2e91d 100644
--- a/system/core/Input.php
+++ b/system/core/Input.php
@@ -212,9 +212,8 @@ class CI_Input {
 	 */
 	public function post_get($index, $xss_clean = FALSE)
 	{
-		return isset($_POST[$index])
-			? $this->post($index, $xss_clean)
-			: $this->get($index, $xss_clean);
+		$output = $this->post($index, $xss_clean);
+		return isset($output) ? $output : $this->get($index, $xss_clean);
 	}
 
 	// --------------------------------------------------------------------
@@ -228,9 +227,8 @@ class CI_Input {
 	 */
 	public function get_post($index, $xss_clean = FALSE)
 	{
-		return isset($_GET[$index])
-			? $this->get($index, $xss_clean)
-			: $this->post($index, $xss_clean);
+		$output = $this->get($index, $xss_clean);
+		return isset($output) ? $output : $this->post($index, $xss_clean);
 	}
 
 	// --------------------------------------------------------------------
diff --git a/tests/codeigniter/core/Input_test.php b/tests/codeigniter/core/Input_test.php
index 80cb9a740..07a99e136 100644
--- a/tests/codeigniter/core/Input_test.php
+++ b/tests/codeigniter/core/Input_test.php
@@ -90,6 +90,23 @@ class Input_test extends CI_TestCase {
 
 	// --------------------------------------------------------------------
 
+	public function test_post_get_array_notation()
+	{
+		$_SERVER['REQUEST_METHOD'] = 'POST';
+		$_POST['foo']['bar'] = 'baz';
+		$barArray = array('bar' => 'baz');
+
+		$this->assertEquals('baz', $this->input->get_post('foo[bar]'));
+		$this->assertEquals($barArray, $this->input->get_post('foo[]'));
+		$this->assertNull($this->input->get_post('foo[baz]'));
+
+		$this->assertEquals('baz', $this->input->post_get('foo[bar]'));
+		$this->assertEquals($barArray, $this->input->post_get('foo[]'));
+		$this->assertNull($this->input->post_get('foo[baz]'));
+	}
+
+	// --------------------------------------------------------------------
+
 	public function test_get_post()
 	{
 		$_SERVER['REQUEST_METHOD'] = 'GET';
@@ -100,6 +117,23 @@ class Input_test extends CI_TestCase {
 
 	// --------------------------------------------------------------------
 
+	public function test_get_post_array_notation()
+	{
+		$_SERVER['REQUEST_METHOD'] = 'GET';
+		$_GET['foo']['bar'] = 'baz';
+		$barArray = array('bar' => 'baz');
+
+		$this->assertEquals('baz', $this->input->get_post('foo[bar]'));
+		$this->assertEquals($barArray, $this->input->get_post('foo[]'));
+		$this->assertNull($this->input->get_post('foo[baz]'));
+
+		$this->assertEquals('baz', $this->input->post_get('foo[bar]'));
+		$this->assertEquals($barArray, $this->input->post_get('foo[]'));
+		$this->assertNull($this->input->post_get('foo[baz]'));
+	}
+
+	// --------------------------------------------------------------------
+
 	public function test_cookie()
 	{
 		$_COOKIE['foo'] = 'bar';