Fix bcit-ci#3201

narfbg · narfbg · commit d2ea460f138f · 2015-10-30T11:47:35.000+02:00
diff --git a/system/core/Common.php b/system/core/Common.php
@@ -752,7 +752,12 @@ function html_escape($var, $double_encode = TRUE)
 
 		if (is_array($var))
 		{
-			return array_map('html_escape', $var, array_fill(0, count($var), $double_encode));
+			foreach (array_keys($var) as $key)
+			{
+				$var[$key] = html_escape($var[$key], $double_encode);
+			}
+
+			return $var;
 		}
 
 		return htmlspecialchars($var, ENT_QUOTES, config_item('charset'), $double_encode);
diff --git a/tests/codeigniter/core/Common_test.php b/tests/codeigniter/core/Common_test.php
@@ -47,6 +47,11 @@ public function test_html_escape()
 			html_escape('Here is a string containing "quoted" text.'),
 			'Here is a string containing &quot;quoted&quot; text.'
 		);
+
+		$this->assertEquals(
+			html_escape(array('associative' => 'and', array('multi' => 'dimentional'))),
+			array('associative' => 'and', array('multi' => 'dimentional'))
+		);
 	}
 
 }
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
@@ -21,6 +21,7 @@ Bug fixes for 3.0.3
 -  Fixed a bug (#4171) - :doc:`Database Transactions <database/transactions>` didn't work with nesting in methods ``trans_begin()``, ``trans_commit()``, ``trans_rollback()``.
 -  Fixed a bug where :doc:`Database Transaction <database/transactions>` methods ``trans_begin()``, ``trans_commit()``, ``trans_rollback()`` ignored failures.
 -  Fixed a bug where all :doc:`Database Transaction <database/transactions>` methods returned TRUE while transactions are actually disabled.
+-  Fixed a bug (#3201) - :doc:`Common function <general/common_functions>` :php:func:`html_escape()` modified keys of its array inputs.
 
 Version 3.0.2
 =============

Original file line number	Diff line number	Diff line change
`@@ -752,7 +752,12 @@ function html_escape($var, $double_encode = TRUE)`
`752`	`752`
`753`	`753`	`if (is_array($var))`
`754`	`754`	`{`
`755`		`- return array_map('html_escape', $var, array_fill(0, count($var), $double_encode));`
	`755`	`+ foreach (array_keys($var) as $key)`
	`756`	`+ {`
	`757`	`+ $var[$key] = html_escape($var[$key], $double_encode);`
	`758`	`+ }`
	`759`	`+`
	`760`	`+ return $var;`
`756`	`761`	`}`
`757`	`762`
`758`	`763`	`return htmlspecialchars($var, ENT_QUOTES, config_item('charset'), $double_encode);`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,11 @@ public function test_html_escape()`
`47`	`47`	`html_escape('Here is a string containing "quoted" text.'),`
`48`	`48`	`'Here is a string containing "quoted" text.'`
`49`	`49`	`);`
	`50`	`+`
	`51`	`+ $this->assertEquals(`
	`52`	`+ html_escape(array('associative' => 'and', array('multi' => 'dimentional'))),`
	`53`	`+ array('associative' => 'and', array('multi' => 'dimentional'))`
	`54`	`+ );`
`50`	`55`	`}`
`51`	`56`
`52`	`57`	`}`