Changeset 3137

Timestamp:

11/17/2005 06:15:59 PM (20 years ago)

Author:

ryan

Message:

Tidy up get_userdatabylogin().

File:

• trunk/wp-includes/pluggable-functions.php (modified) (3 diffs)

trunk/wp-includes/pluggable-functions.php

@@ -65 +65 @@
 if ( !function_exists('update_user_cache') ) :
 function update_user_cache() {
-    global $cache_userdata, $wpdb;
-    $level_key = $wpdb->prefix . 'user_level';
-    $user_ids = $wpdb->get_col("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = '$level_key'");
-    $user_ids = join(',', $user_ids);
-    $query = apply_filters('user_cache_query', "SELECT * FROM $wpdb->users WHERE ID IN ($user_ids)");
-    if ( $users = $wpdb->get_results( $query ) ) :
-        foreach ($users as $user) :
-            $metavalues = $wpdb->get_results("SELECT meta_key, meta_value FROM $wpdb->usermeta WHERE user_id = '$user->ID'");
-            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;
-            }
-
-            $cache_userdata[$user->ID] = $user;
-            $cache_userdata[$user->user_login] =& $cache_userdata[$user->ID];
-        endforeach;
-        return true;
-    else : 
-        return false;
-    endif;
+    return true;
 }
 endif;
@@ -95 +71 @@
 if ( !function_exists('get_userdatabylogin') ) :
 function get_userdatabylogin($user_login) {
-    global $cache_userdata, $wpdb;
+    global $wpdb;
     $user_login = sanitize_user( $user_login );
 
@@ -106 +82 @@
 
     if ( !$user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE user_login = '$user_login'") )
-        return $cache_userdata[$user_login] = false;
+        return false;
 
     $metavalues = $wpdb->get_results("SELECT meta_key, meta_value FROM $wpdb->usermeta WHERE user_id = '$user->ID'");
 
-    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;
-    }
-
-    $cache_userdata[$user->ID] = $user;
-    $cache_userdata[$cache_userdata[$user->ID]->user_login] =& $cache_userdata[$user->ID];
-
-    return $cache_userdata[$user->ID];
+    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, 'users');
+
+    return $user;
 
 }