Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

get_user_by_email() and some user caching cleanups. fixes #5392 

git-svn-id: http://svn.automattic.com/wordpress/trunk@6346 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2007-11-27 22:14:53 +00:00
parent ec4bcf7080
commit 43b7cd700f
4 changed files with 87 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-admin/includes/user.php
View File

@ -272,6 +272,7 @@ function wp_delete_user($id, $reassign = 'novalue') {
wp_cache_delete($id, 'users');
wp_cache_delete($user->user_login, 'userlogins');
wp_cache_delete($user->user_email, 'useremail');
return true;
}

83
wp-includes/pluggable.php
View File

@ -60,43 +60,25 @@ endif;
if ( !function_exists('get_userdata') ) :
function get_userdata( $user_id ) {
global $wpdb;
$user_id = abs(intval($user_id));
if ( $user_id == 0 )
return false;
$user = wp_cache_get($user_id, 'users');
if ( $user )
if ( '0' === $user )
return false;
else if ( $user )
return $user;
if ( !$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE ID = %d LIMIT 1", $user_id)) )
if ( !$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE ID = %d LIMIT 1", $user_id)) ) {
wp_cache_add($user_id, 0, 'users');
return false;
}
$wpdb->hide_errors();
$metavalues = $wpdb->get_results($wpdb->prepare("SELECT meta_key, meta_value FROM $wpdb->usermeta WHERE user_id = %d", $user_id));
$wpdb->show_errors();
_fill_user($user);
if ($metavalues) {
foreach ( $metavalues as $meta ) {
$value = maybe_unserialize($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;
} // end foreach
} //end if
// For backwards compat.
if ( isset($user->first_name) )
$user->user_firstname = $user->first_name;
if ( isset($user->last_name) )
$user->user_lastname = $user->last_name;
if ( isset($user->description) )
$user->user_description = $user->description;
wp_cache_add($user_id, $user, 'users');
wp_cache_add($user->user_login, $user_id, 'userlogins');
return $user;
}
endif;
@ -116,15 +98,50 @@ function get_userdatabylogin($user_login) {
return false;
$user_id = wp_cache_get($user_login, 'userlogins');
$userdata = wp_cache_get($user_id, 'users');
if ( $userdata )
return $userdata;
if ( !$user_ID = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_login = %s", $user_login)) )
if ( '0' === $user_id )
return false;
$user = get_userdata($user_ID);
$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)) ) {
wp_cache_add($user_login, 0, 'userlogins');
return false;
}
_fill_user($user);
return $user;
}
endif;
if ( !function_exists('get_user_by_email') ) :
function get_user_by_email($email) {
global $wpdb;
$user_id = wp_cache_get($email, 'useremail');
if ( '0' === $user_id )
return false;
$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)) ) {
wp_cache_add($email, 0, 'useremail');
return false;
}
_fill_user($user);
return $user;
}
endif;

8
wp-includes/registration.php
View File

@ -6,7 +6,7 @@
* @return mixed The user's ID on success, and null on failure.
*/
function username_exists( $username ) {
if ( $user = get_userdatabylogin( sanitize_user( $username ) ) ) {
if ( $user = get_userdatabylogin( $username ) ) {
return $user->ID;
} else {
return null;
@ -20,8 +20,10 @@ function username_exists( $username ) {
* @return mixed The user's ID on success, and false on failure.
*/
function email_exists( $email ) {
global $wpdb;
return $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->users WHERE user_email = %s", $email) );
if ( $user = get_user_by_email($email) )
return $user->ID;
return false;
}
/**

33
wp-includes/user.php
View File

@ -78,7 +78,6 @@ function delete_usermeta( $user_id, $meta_key, $meta_value = '' ) {
$user = get_userdata($user_id);
wp_cache_delete($user_id, 'users');
wp_cache_delete($user->user_login, 'userlogins');
return true;
}
@ -142,7 +141,6 @@ function update_usermeta( $user_id, $meta_key, $meta_value ) {
$user = get_userdata($user_id);
wp_cache_delete($user_id, 'users');
wp_cache_delete($user->user_login, 'userlogins');
return true;
}
@ -238,4 +236,35 @@ function wp_dropdown_users( $args = '' ) {
return $output;
}
function _fill_user( &$user ) {
global $wpdb;
$wpdb->hide_errors();
$metavalues = $wpdb->get_results($wpdb->prepare("SELECT meta_key, meta_value FROM $wpdb->usermeta WHERE user_id = %d", $user->ID));
$wpdb->show_errors();
if ( $metavalues ) {
foreach ( $metavalues as $meta ) {
$value = maybe_unserialize($meta->meta_value);
$user->{$meta->meta_key} = $value;
}
}
$level = $wpdb->prefix . 'user_level';
if ( isset( $user->{$level} ) )
$user->user_level = $user->{$level};
// For backwards compat.
if ( isset($user->first_name) )
$user->user_firstname = $user->first_name;
if ( isset($user->last_name) )
$user->user_lastname = $user->last_name;
if ( isset($user->description) )
$user->user_description = $user->description;
wp_cache_add($user->ID, $user, 'users');
wp_cache_add($user->user_login, $user->ID, 'userlogins');
wp_cache_add($user->user_email, $user->ID, 'useremail');
}
?>