Ticket #2134: pluggable-functions.php.diff

wp-includes/pluggable-functions.php

@@ -28 +28 @@
 endif;
 
 if ( !function_exists('get_userdata') ) :
-function get_userdata( $user_id ) {
+function get_userdata( $user_id, $user_row=false ) {
         global $wpdb;
+        if ( !$user_row ) {     
         $user_id = (int) $user_id;
         if ( $user_id == 0 )
                 return false;
@@ -41 +42 @@
 
         if ( !$user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE ID = '$user_id' LIMIT 1") )
                 return false;
+        } else
+                $user = $user_row;
 
         $wpdb->hide_errors();
         $metavalues = $wpdb->get_results("SELECT meta_key, meta_value FROM $wpdb->usermeta WHERE user_id = '$user_id'");
@@ -83 +86 @@
         $userdata = wp_cache_get($user_login, 'userlogins');
         if ( $userdata )
                 return $userdata;
-
-        if ( !$user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE user_login = '$user_login'") )
+        elseif ( $user = $wpdb->get_var("SELECT * FROM $wpdb->users WHERE user_login = '$user_login'") )
+                return get_userdata($user->$ID, $user);
+        else
                 return false;
-
-        $wpdb->hide_errors();
-        $metavalues = $wpdb->get_results("SELECT meta_key, meta_value FROM $wpdb->usermeta WHERE user_id = '$user->ID'");
-        $wpdb->show_errors();
-
-        if ($metavalues) {
-                foreach ( $metavalues as $meta ) {
-                        @ $value = unserialize($meta->meta_value);
-                        if ($value === FALSE)
-                                $value = $meta->meta_value;
-                        $user->{$meta->meta_key} = $value;
-
-                        // We need to set user_level from meta, not row
-                        if ( $wpdb->prefix . 'user_level' == $meta->meta_key )
-                                $user->user_level = $meta->meta_value;
-                }
-        }
-
-        wp_cache_add($user->ID, $user, 'users');
-        wp_cache_add($user->user_login, $user, 'userlogins');
-
-        return $user;
-
 }
 endif;