Merge pull request #624 from acidtv/3.3/develop

Fixing #623: Arr::map doesn't work with multidimensional array and keys
kohana · Jul 10, 2015 · 98615c5 · 98615c5
2 parents 0d3cf9b + a226178
commit 98615c5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/classes/Kohana/Arr.php b/classes/Kohana/Arr.php
@@ -393,7 +393,7 @@ public static function map($callbacks, $array, $keys = NULL)
 		{
 			if (is_array($val))
 			{
-				$array[$key] = Arr::map($callbacks, $array[$key]);
+				$array[$key] = Arr::map($callbacks, $array[$key], $keys);
 			}
 			elseif ( ! is_array($keys) OR in_array($key, $keys))
 			{

diff --git a/tests/kohana/ArrTest.php b/tests/kohana/ArrTest.php
@@ -655,6 +655,22 @@ public function provider_map()
 					'bar' => 'foobar',
 				),
 			),
+			array(
+				'strip_tags',
+				array(
+					array(
+						'foo' => '<p>foobar</p>',
+						'bar' => '<p>foobar</p>',
+					),
+				),
+				array('foo'),
+				array(
+					array(
+						'foo' => 'foobar',
+						'bar' => '<p>foobar</p>',
+					),
+				),
+			),
 		);
 	}