Ticket #13319: 13319.patch

wp-includes/user.php

@@ -663 +663 @@
  *
  * @since 3.0.0
  * @param array $ids User ID numbers list.
- * @return array of arrays. The array is indexed by user_id, containing $metavalues object arrays.
+ * @return array of arrays. The array is indexed by user_id, containing an array of $metavalues database result objects for that user.
  */
-function get_user_metavalues($ids) {
+function get_user_metavalues( $ids ) {
         global $wpdb;
 
-        $clean = array_map('intval', $ids);
-        if ( 0 == count($clean) )
+        $clean = array_map( 'intval', $ids );
+        if ( 0 == count( $clean ) )
                 return $objects;
 
-        $list = implode(',', $clean);
+        $list = implode( ',', $clean );
 
         $show = $wpdb->hide_errors();
-        $metavalues = $wpdb->get_results("SELECT user_id, meta_key, meta_value FROM $wpdb->usermeta WHERE user_id IN ($list)");
-        $wpdb->show_errors($show);
+        $metavalues = $wpdb->get_results( "SELECT user_id, meta_key, meta_value FROM {$wpdb->usermeta} WHERE user_id IN ($list)" );
+        $wpdb->show_errors( $show );
 
         $objects = array();
-        foreach($clean as $id) {
+        foreach ( $clean as $id ) {
                 $objects[$id] = array();
         }
-        foreach($metavalues as $meta_object) {
-                $objects[$meta_object->user_id][] = $meta_object;
+        foreach ( array_keys( $metavalues ) as $key ) {
+                $objects[$metavalues[$key]->user_id][] = &$metavalues[$key];
         }
 
         return $objects;
@@ -695 +695 @@
  * @since 3.0.0
  * @param object $user The User object.
  * @param array $metavalues An array of objects provided by get_user_metavalues()
+ * @return void
  */
-function _fill_single_user( &$user, &$metavalues ) {
+function _fill_single_user( &$user, $metavalues ) {
         global $wpdb;
 
-        foreach ( $metavalues as $meta ) {
-                $value = maybe_unserialize($meta->meta_value);
-                // Keys used as object vars cannot have dashes.
-                $key = str_replace('-', '', $meta->meta_key);
-                $user->{$key} = $value;
+        foreach ( array_keys( $metavalues ) as $key ) {
+                // Keys used as Object Properties cannot have dashes.
+                $property          = str_replace( '-', '', $metavalues[$key]->meta_key );
+                $user->{$property} = maybe_unserialize( $metavalues[$key]->meta_value );
         }
 
         $level = $wpdb->prefix . 'user_level';
@@ -711 +711 @@
                 $user->user_level = $user->{$level};
 
         // For backwards compat.
-        if ( isset($user->first_name) )
+        if ( isset( $user->first_name ) )
                 $user->user_firstname = $user->first_name;
-        if ( isset($user->last_name) )
+        if ( isset( $user->last_name ) )
                 $user->user_lastname = $user->last_name;
-        if ( isset($user->description) )
+        if ( isset( $user->description ) )
                 $user->user_description = $user->description;
 
-        update_user_caches($user);
+        update_user_caches( $user );
 }
 
 /**
@@ -726 +726 @@
  *
  * @since 3.0.0
  * @param array $users User objects
- * @param array $metas User metavalues objects
+ * @return void
  */
-function _fill_many_users( &$users ) {
+function _fill_many_users( $users ) {
         $ids = array();
-        foreach($users as $user_object) {
-                $ids[] = $user_object->ID;
+        foreach ( array_keys( $users ) as $key ) {
+                $ids[] = $users[$key]->ID;
         }
 
-    $metas = get_user_metavalues($ids);
+    $metas = get_user_metavalues( $ids );
 
-        foreach($users as $user_object) {
-                if (isset($metas[$user_object->ID])) {
-                _fill_single_user($user_object, $metas[$user_object->ID]);
+        foreach( array_keys( $users ) as $key ) {
+                $user_id = $users[$key]->ID;
+                if ( isset( $metas[$user_id] ) ) {
+                _fill_single_user( $users[$key], $metas[$user_id] );
                 }
         }
 }