Cache user lookups made by nicename. Add get_user_by(). fixes #4170

git-svn-id: http://svn.automattic.com/wordpress/trunk@10992 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2009-04-17 21:25:11 +00:00
parent bc7bcfbd79
commit 4956e5d453
4 changed files with 51 additions and 38 deletions

View File

@ -447,6 +447,7 @@ function wp_delete_user($id, $reassign = 'novalue') {
wp_cache_delete($id, 'users'); wp_cache_delete($id, 'users');
wp_cache_delete($user->user_login, 'userlogins'); wp_cache_delete($user->user_login, 'userlogins');
wp_cache_delete($user->user_email, 'useremail'); wp_cache_delete($user->user_email, 'useremail');
wp_cache_delete($user->user_nicename, 'userslugs');
// allow for commit transaction // allow for commit transaction
do_action('deleted_user', $id); do_action('deleted_user', $id);

View File

@ -139,6 +139,50 @@ function get_userdata( $user_id ) {
} }
endif; endif;
/**
* Retrieve user info by a given field
*
* @since 2.8.0
*
* @param string $field The field to retrieve the user with. id | slug | email | login
* @param int|string $value A value for $field. A user ID, slug, email address, or login name.
* @return bool|object False on failure, User DB row object
*/
function get_user_by($field, $value) {
global $wpdb;
switch ($field) {
case 'id':
return get_userdata($value);
break;
case 'slug':
$user_id = wp_cache_get($value, 'userslugs');
$field = 'user_nicename';
break;
case 'email':
$user_id = wp_cache_get($value, 'useremail');
$field = 'user_email';
break;
case 'login':
$value = sanitize_user( $value );
$user_id = wp_cache_get($value, 'userlogins');
$field = 'user_login';
break;
default:
return false;
}
if ( false !== $user_id )
return get_userdata($user_id);
if ( !$user = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->users WHERE $field = %s", $value) ) )
return false;
_fill_user($user);
return $user;
}
if ( !function_exists('get_userdatabylogin') ) : if ( !function_exists('get_userdatabylogin') ) :
/** /**
* Retrieve user info by login name. * Retrieve user info by login name.
@ -149,27 +193,7 @@ if ( !function_exists('get_userdatabylogin') ) :
* @return bool|object False on failure, User DB row object * @return bool|object False on failure, User DB row object
*/ */
function get_userdatabylogin($user_login) { function get_userdatabylogin($user_login) {
global $wpdb; return get_user_by('login', $user_login);
$user_login = sanitize_user( $user_login );
if ( empty( $user_login ) )
return false;
$user_id = wp_cache_get($user_login, 'userlogins');
$user = false;
if ( false !== $user_id )
$user = wp_cache_get($user_id, 'users');
if ( false !== $user )
return $user;
if ( !$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_login = %s", $user_login)) )
return false;
_fill_user($user);
return $user;
} }
endif; endif;
@ -183,23 +207,7 @@ if ( !function_exists('get_user_by_email') ) :
* @return bool|object False on failure, User DB row object * @return bool|object False on failure, User DB row object
*/ */
function get_user_by_email($email) { function get_user_by_email($email) {
global $wpdb; return get_user_by('email', $email);
$user_id = wp_cache_get($email, 'useremail');
$user = false;
if ( false !== $user_id )
$user = wp_cache_get($user_id, 'users');
if ( false !== $user )
return $user;
if ( !$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_email = %s", $email)) )
return false;
_fill_user($user);
return $user;
} }
endif; endif;

View File

@ -2004,6 +2004,9 @@ class WP_Query {
} }
$q['author_name'] = sanitize_title($q['author_name']); $q['author_name'] = sanitize_title($q['author_name']);
$q['author'] = $wpdb->get_var("SELECT ID FROM $wpdb->users WHERE user_nicename='".$q['author_name']."'"); $q['author'] = $wpdb->get_var("SELECT ID FROM $wpdb->users WHERE user_nicename='".$q['author_name']."'");
$q['author'] = get_user_by('slug', $q['author_name']);
if ( $q['author'] )
$q['author'] = $q['author']->ID;
$whichauthor .= " AND ($wpdb->posts.post_author = ".absint($q['author']).')'; $whichauthor .= " AND ($wpdb->posts.post_author = ".absint($q['author']).')';
} }

View File

@ -597,6 +597,7 @@ function _fill_user( &$user ) {
wp_cache_add($user->ID, $user, 'users'); wp_cache_add($user->ID, $user, 'users');
wp_cache_add($user->user_login, $user->ID, 'userlogins'); wp_cache_add($user->user_login, $user->ID, 'userlogins');
wp_cache_add($user->user_email, $user->ID, 'useremail'); wp_cache_add($user->user_email, $user->ID, 'useremail');
wp_cache_add($user->user_nicename, $user->ID, 'userslugs');
} }
?> ?>