Changeset 36101 for branches/4.4/src/wp-includes/formatting.php

Timestamp:

12/26/2015 05:23:43 AM (11 years ago)

Author:

dd32

Message:

Allow map_deep() to work with object properties containing a reference. Restores the previous behaviour of stripslashes_deep().

Merges [36100] to the 4.4 branch.
Props jeff@…, swissspidy.
See #22300, [35252].
Fixes #35058.

Location:

branches/4.4

Files:

• . (modified) (1 prop)
• src/wp-includes/formatting.php (modified) (1 diff)

branches/4.4/src/wp-includes/formatting.php

@@ -3897 +3897 @@
  */
 function map_deep( $value, $callback ) {
-        if ( is_array( $value ) || is_object( $value ) ) {
-                foreach ( $value as &$item ) {
-                        $item = map_deep( $item, $callback );
-                }
-                return $value;
+        if ( is_array( $value ) ) {
+                foreach ( $value as $index => $item ) {
+                        $value[ $index ] = map_deep( $item, $callback );
+                }
+        } elseif ( is_object( $value ) ) {
+                $object_vars = get_object_vars( $value );
+                foreach ( $object_vars as $property_name => $property_value ) {
+                        $value->$property_name = map_deep( $property_value, $callback );
+                }
         } else {
-                return call_user_func( $callback, $value );
-        }
+                $value = call_user_func( $callback, $value );
+        }
+
+        return $value;
 }