Changeset 10992

Timestamp:

04/17/2009 09:25:11 PM (16 years ago)

Author:

ryan

Message:

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

Location:

trunk

Files:

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

trunk/wp-admin/includes/user.php

@@ -448 +448 @@
     wp_cache_delete($user->user_login, 'userlogins');
     wp_cache_delete($user->user_email, 'useremail');
+    wp_cache_delete($user->user_nicename, 'userslugs');
     
     // allow for commit transaction

trunk/wp-includes/pluggable.php

@@ -140 +140 @@
 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') ) :
 /**
@@ -150 +194 @@
  */
 function get_userdatabylogin($user_login) {
-    global $wpdb;
-    $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;
+    return get_user_by('login', $user_login);
 }
 endif;
@@ -184 +208 @@
  */
 function get_user_by_email($email) {
-    global $wpdb;
-
-    $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;
+    return get_user_by('email', $email);
 }
 endif;

trunk/wp-includes/query.php

@@ -2005 +2005 @@
             $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'] = get_user_by('slug', $q['author_name']);
+            if ( $q['author'] )
+                $q['author'] = $q['author']->ID; 
             $whichauthor .= " AND ($wpdb->posts.post_author = ".absint($q['author']).')';
         }

trunk/wp-includes/user.php

@@ -598 +598 @@
     wp_cache_add($user->user_login, $user->ID, 'userlogins');
     wp_cache_add($user->user_email, $user->ID, 'useremail');
+    wp_cache_add($user->user_nicename, $user->ID, 'userslugs');
 }