From 4956e5d453b1f65c1b619b6fafa62f1fc526c3d4 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 17 Apr 2009 21:25:11 +0000
Subject: [PATCH] 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
---
 wp-admin/includes/user.php |  1 +
 wp-includes/pluggable.php  | 84 +++++++++++++++++++++-----------------
 wp-includes/query.php      |  3 ++
 wp-includes/user.php       |  1 +
 4 files changed, 51 insertions(+), 38 deletions(-)

diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php
index e54a1beaf..567c4a696 100644
--- a/wp-admin/includes/user.php
+++ b/wp-admin/includes/user.php
@@ -447,6 +447,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');
+	wp_cache_delete($user->user_nicename, 'userslugs');
 	
 	// allow for commit transaction
 	do_action('deleted_user', $id);
diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index d2d723a3d..ee6630046 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -139,6 +139,50 @@ function get_userdata( $user_id ) {
 }
 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') ) :
 /**
  * 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
  */
 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;
 
@@ -183,23 +207,7 @@ if ( !function_exists('get_user_by_email') ) :
  * @return bool|object False on failure, User DB row object
  */
 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;
 
diff --git a/wp-includes/query.php b/wp-includes/query.php
index 1ed55d884..5cc713a89 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -2004,6 +2004,9 @@ class WP_Query {
 			}
 			$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']).')';
 		}
 
diff --git a/wp-includes/user.php b/wp-includes/user.php
index c8a35bb9e..c7ab654d9 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -597,6 +597,7 @@ function _fill_user( &$user ) {
 	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');
+	wp_cache_add($user->user_nicename, $user->ID, 'userslugs');
 }
 
 ?>