Ticket #15545: 15545.diff

wp-includes/user.php

@@ -1037 +1037 @@
         foreach ( $ids as $id )
                 $objects[$id] = array();
 
-        update_meta_cache('user', $ids);
+        $metas = update_meta_cache('user', $ids);
 
-        foreach ( $ids as $id ) {
-                $meta = get_metadata('user', $id);
+        foreach ( $metas as $id => $meta ) {
                 foreach ( $meta as $key => $metavalues ) {
                         foreach ( $metavalues as $value ) {
                                 $objects[$id][] = (object)array( 'user_id' => $id, 'meta_key' => $key, 'meta_value' => $value);

wp-includes/meta.php

@@ -259 +259 @@
         $meta_cache = wp_cache_get($object_id, $meta_type . '_meta');
 
         if ( !$meta_cache ) {
-                update_meta_cache($meta_type, $object_id);
-                $meta_cache = wp_cache_get($object_id, $meta_type . '_meta');
+                $meta_cache = update_meta_cache( $meta_type, array( $object_id ) );
+                $meta_cache = $meta_cache[$object_id];
         }
 
         if ( !$meta_key )
@@ -309 +309 @@
 
         $cache_key = $meta_type . '_meta';
         $ids = array();
+        $cache = array();
         foreach ( $object_ids as $id ) {
-                if ( false === wp_cache_get($id, $cache_key) )
+                $cached_object = wp_cache_get( $id, $cache_key );
+                if ( false === $cached_object )
                         $ids[] = $id;
+                else
+                        $cache[$id] = $cached_object;
         }
 
         if ( empty( $ids ) )
-                return false;
+                return $cache;
 
         // Get meta info
         $id_list = join(',', $ids);
-        $cache = array();
         $meta_list = $wpdb->get_results( $wpdb->prepare("SELECT $column, meta_key, meta_value FROM $table WHERE $column IN ($id_list)",
                 $meta_type), ARRAY_A );
 
@@ -343 +346 @@
         foreach ( $ids as $id ) {
                 if ( ! isset($cache[$id]) )
                         $cache[$id] = array();
+                wp_cache_add( $id, $cache[$id], $cache_key );
         }
 
-        foreach ( array_keys($cache) as $object)
-                wp_cache_add($object, $cache[$object], $cache_key);
-
         return $cache;
 }