Changeset 6346

Timestamp:

11/27/2007 10:14:53 PM (17 years ago)

Author:

ryan

Message:

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

Location:

trunk

Files:

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

trunk/wp-admin/includes/user.php

@@ -273 +273 @@
     wp_cache_delete($id, 'users');
     wp_cache_delete($user->user_login, 'userlogins');
+    wp_cache_delete($user->user_email, 'useremail');
 
     return true;

trunk/wp-includes/pluggable.php

@@ -61 +61 @@
 function get_userdata( $user_id ) {
     global $wpdb;
+
     $user_id = abs(intval($user_id));
     if ( $user_id == 0 )
@@ -67 +68 @@
     $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)) )
-        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();
-
-    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');
+    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;
+    }
+
+    _fill_user($user);
+
     return $user;
 }
@@ -117 +99 @@
 
     $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)) )
-        return false;
-
-    $user = get_userdata($user_ID);
+    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_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;
 }

trunk/wp-includes/registration.php

@@ -7 +7 @@
  */
 function username_exists( $username ) {
-    if ( $user = get_userdatabylogin( sanitize_user( $username ) ) ) {
+    if ( $user = get_userdatabylogin( $username ) ) {
         return $user->ID;
     } else {
@@ -21 +21 @@
  */
 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;
 }
 

trunk/wp-includes/user.php

@@ -79 +79 @@
     $user = get_userdata($user_id);
     wp_cache_delete($user_id, 'users');
-    wp_cache_delete($user->user_login, 'userlogins');
 
     return true;
@@ -143 +142 @@
     $user = get_userdata($user_id);
     wp_cache_delete($user_id, 'users');
-    wp_cache_delete($user->user_login, 'userlogins');
 
     return true;
@@ -239 +237 @@
 }
 
+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');
+}
+
 ?>