From 6ef7b48c2da1ad9731e1f4734be86ed3ae5afca0 Mon Sep 17 00:00:00 2001 From: donncha Date: Mon, 5 Feb 2007 11:49:12 +0000 Subject: WP Merge to rev 4865 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@879 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-includes/pluggable.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'wp-includes/pluggable.php') 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; } -- cgit