From 0c0bfbce3e3aec435112e02b239186eb40c4cfc2 Mon Sep 17 00:00:00 2001
From: westi <westi@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 27 Nov 2009 18:17:44 +0000
Subject: [PATCH] Restore functionality of setup_userdata() when a user id is
 supplied. See #11271 and #11222.

git-svn-id: http://svn.automattic.com/wordpress/trunk@12288 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/user.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/wp-includes/user.php b/wp-includes/user.php
index 055476207..120ec65ad 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -448,15 +448,15 @@ function update_usermeta( $user_id, $meta_key, $meta_value ) {
  * @global string $user_pass_md5 MD5 of the user's password
  * @global string $user_identity The display name of the user
  *
- * @param int $user_id Optional. User ID to setup global data.
+ * @param int $for_user_id Optional. User ID to setup global data.
  */
-function setup_userdata($user_id = '') {
+function setup_userdata($for_user_id = '') {
 	global $user_login, $userdata, $user_level, $user_id, $user_ID, $user_email, $user_url, $user_pass_md5, $user_identity;
 
-	if ( '' == $user_id )
+	if ( '' == $for_user_id )
 		$user = wp_get_current_user();
 	else
-		$user = new WP_User($user_id);
+		$user = new WP_User($for_user_id);
 
 	if ( 0 == $user->ID )
 		return;