Making h() preserve keys when escaping an array.

cakephp · Oct 23, 2010 · 3e2d09a · 3e2d09a
1 parent 7aaf7e6
commit 3e2d09a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/cake/basics.php b/cake/basics.php
@@ -151,8 +151,8 @@ function sortByKey(&$array, $sortby, $order = 'asc', $type = SORT_NUMERIC) {
 	function h($text, $double = true, $charset = null) {
 		if (is_array($text)) {
 			$texts = array();
-			foreach ($text as $t) {
-				$texts[] = h($t, $double, $charset);
+			foreach ($text as $k => $t) {
+				$texts[$k] = h($t, $double, $charset);
 			}
 			return $texts;
 		}

diff --git a/cake/tests/cases/basics.test.php b/cake/tests/cases/basics.test.php
@@ -228,6 +228,14 @@ public function testH() {
 			'&nbsp;'
 		);
 		$this->assertEqual($expected, $result);
+
+		$arr = array('f' => '<foo>', 'n' => '&nbsp;');
+		$result = h($arr, false);
+		$expected = array(
+			'f' => '&lt;foo&gt;',
+			'n' => '&nbsp;'
+		);
+		$this->assertEqual($expected, $result);
 	}
 
 /**