Ticket #4753: simpler_get_userdatabylogin.diff

wp-includes/pluggable.php

@@ -115 +115 @@
         if ( empty( $user_login ) )
                 return false;
 
-        $user_id = wp_cache_get($user_login, 'userlogins');
-        $userdata = wp_cache_get($user_id, 'users');
-
-        if ( $userdata )
-                return $userdata;
-
-        $user_login = $wpdb->escape($user_login);
-
-        if ( !$user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE user_login = '$user_login'") )
-                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 = maybe_unserialize($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;
-                }
+        if ( ! $user_id = wp_cache_get($user_login, 'userlogins') ) {
+                $user_login = $wpdb->escape($user_login);
+                $user_id = $wpdb->get_var("SELECT ID FROM $wpdb->users WHERE user_login = '$user_login' LIMIT 1");
+                wp_cache_add($user_login, $user_id, 'userlogins');
         }
+        
+        if ( ! $userdata = wp_cache_get($user_id, 'users') ) {
+                $userdata = get_userdata( $user_id );
+                wp_cache_add($user_id, $userdata, 'users');
+        }
 
-        // For backwards compat.
-        if ( isset($user->first_name) )
-                $user->user_firstname = $user->first_name;
-        if ( isset($user->last_name) )
-                $user->user_lastname = $user->last_name;
-        if ( isset($user->description) )
-                $user->user_description = $user->description;
-
-        wp_cache_add($user->ID, $user, 'users');
-        wp_cache_add($user->user_login, $user->ID, 'userlogins');
-        return $user;
-
+        return $userdata;
 }
 endif;