Changeset 3330

Timestamp:

12/19/2005 07:14:22 PM (21 years ago)

Author:

ryan

Message:

Cache user ids and user logins separately to avoid collision. Props donncha. fixes #2096

Location:

trunk

Files:

• wp-admin/admin-db.php (modified) (1 diff)
• wp-includes/cache.php (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)
• wp-includes/pluggable-functions.php (modified) (3 diffs)
• wp-includes/registration-functions.php (modified) (1 diff)

trunk/wp-admin/admin-db.php

@@ -242 +242 @@
 
         wp_cache_delete($id, 'users');
-        wp_cache_delete($user->user_login, 'users');
+        wp_cache_delete($user->user_login, 'userlogins');
 
         do_action('delete_user', $id);

trunk/wp-includes/cache.php

@@ -59 +59 @@
         var $dirty_objects = array ();
         var $non_existant_objects = array ();
-        var $global_groups = array ('users', 'usermeta');
+        var $global_groups = array ('users', 'userlogins', 'usermeta');
         var $blog_id;
         var $cold_cache_hits = 0;

trunk/wp-includes/functions.php

@@ -2213 +2213 @@
         $user = get_userdata($user_id);
         wp_cache_delete($user_id, 'users');
-        wp_cache_delete($user->user_login, 'users');
+        wp_cache_delete($user->user_login, 'userlogins');
         
         return true;
@@ -2235 +2235 @@
         $user = get_userdata($user_id);
         wp_cache_delete($user_id, 'users');
-        wp_cache_delete($user->user_login, 'users');
+        wp_cache_delete($user->user_login, 'userlogins');
         
         return true;

trunk/wp-includes/pluggable-functions.php

@@ -59 +59 @@
 
         wp_cache_add($user_id, $user, 'users');
-        wp_cache_add($user->user_login, $user, 'users');
+        wp_cache_add($user->user_login, $user, 'userlogins');
         
         return $user;
@@ -79 +79 @@
                 return false;
                 
-        $userdata = wp_cache_get($user_login, 'users');
+        $userdata = wp_cache_get($user_login, 'userlogins');
         if ( $userdata )
                 return $userdata;
@@ -102 +102 @@
 
         wp_cache_add($user->ID, $user, 'users');
-        wp_cache_add($user->user_login, $user, 'users');
+        wp_cache_add($user->user_login, $user, 'userlogins');
 
         return $user;

trunk/wp-includes/registration-functions.php

@@ -71 +71 @@
 
         wp_cache_delete($user_id, 'users');
-        wp_cache_delete($user_login, 'users');
+        wp_cache_delete($user_login, 'userlogins');
         
         if ( $update )