diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-02-05 11:49:12 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-02-05 11:49:12 +0000 |
| commit | 6ef7b48c2da1ad9731e1f4734be86ed3ae5afca0 (patch) | |
| tree | 0a0c0a8c8146ef18a1aa87016c9a3f7e3ced1618 /wp-includes/pluggable.php | |
| parent | 4c4e0fc82e70e810472721ad23aac64ba2c5b6e1 (diff) | |
| download | wordpress-mu-6ef7b48c2da1ad9731e1f4734be86ed3ae5afca0.tar.gz wordpress-mu-6ef7b48c2da1ad9731e1f4734be86ed3ae5afca0.tar.xz wordpress-mu-6ef7b48c2da1ad9731e1f4734be86ed3ae5afca0.zip | |
WP Merge to rev 4865
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@879 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/pluggable.php')
| -rw-r--r-- | wp-includes/pluggable.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php index a4bb24b..0442789 100644 --- a/wp-includes/pluggable.php +++ b/wp-includes/pluggable.php @@ -96,8 +96,7 @@ function get_userdata( $user_id ) { $user->user_description = $user->description; wp_cache_add($user_id, $user, 'users'); - wp_cache_add($user->user_login, $user, 'userlogins'); - + wp_cache_add($user->user_login, $user_id, 'userlogins'); return $user; } endif; @@ -116,7 +115,9 @@ function get_userdatabylogin($user_login) { if ( empty( $user_login ) ) return false; - $userdata = wp_cache_get($user_login, 'userlogins'); + $user_id = wp_cache_get($user_login, 'userlogins'); + $userdata = wp_cache_get($user_id, 'users'); + if ( $userdata ) return $userdata; @@ -153,8 +154,7 @@ function get_userdatabylogin($user_login) { } wp_cache_add($user->ID, $user, 'users'); - wp_cache_add($user->user_login, $user, 'userlogins'); - + wp_cache_add($user->user_login, $user->ID, 'userlogins'); return $user; } |