From 80f16956193e0cf6830ff0a36d5530b9bfb0c8d4 Mon Sep 17 00:00:00 2001
From: Ryan Boren <ryan@git.wordpress.org>
Date: Thu, 16 Jun 2005 06:27:30 +0000
Subject: [PATCH] Straighten out user_id/user_ID conflict.  Don't make user_id
 global in get_currentuserinfo() because it stomps on the local user_id in
 user-edit.

git-svn-id: https://develop.svn.wordpress.org/trunk@2644 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/user-edit.php              | 16 ++++++++--------
 wp-includes/pluggable-functions.php |  3 +--
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index c70f3366b9..b933568a4d 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -68,14 +68,14 @@ $new_description = $_POST['new_description'];
 
 $result = $wpdb->query("UPDATE $wpdb->users SET user_login = '$new_user_login', $updatepassword user_email='$new_email', user_url='$new_url', user_nicename = '$new_nicename', display_name = '$display_name' WHERE ID = '$user_id'");
 
-update_usermeta( $user_ID, 'first_name', $new_firstname );
-update_usermeta( $user_ID, 'last_name', $new_lastname );
-update_usermeta( $user_ID, 'nickname', $new_nickname );
-update_usermeta( $user_ID, 'description', $new_description );
-update_usermeta( $user_ID, 'icq', $new_icq );
-update_usermeta( $user_ID, 'aim', $new_aim );
-update_usermeta( $user_ID, 'msn', $new_msn );
-update_usermeta( $user_ID, 'yim', $new_yim );
+update_usermeta( $user_id, 'first_name', $new_firstname );
+update_usermeta( $user_id, 'last_name', $new_lastname );
+update_usermeta( $user_id, 'nickname', $new_nickname );
+update_usermeta( $user_id, 'description', $new_description );
+update_usermeta( $user_id, 'icq', $new_icq );
+update_usermeta( $user_id, 'aim', $new_aim );
+update_usermeta( $user_id, 'msn', $new_msn );
+update_usermeta( $user_id, 'yim', $new_yim );
 
 header("Location: user-edit.php?user_id=$user_id&updated=true");
 
diff --git a/wp-includes/pluggable-functions.php b/wp-includes/pluggable-functions.php
index 7aad5fc0c1..2ec3a81126 100644
--- a/wp-includes/pluggable-functions.php
+++ b/wp-includes/pluggable-functions.php
@@ -6,7 +6,7 @@
 
 if ( !function_exists('get_currentuserinfo') ) :
 function get_currentuserinfo() {
-	global $user_login, $userdata, $user_level, $user_ID, $user_id, $user_email, $user_url, $user_pass_md5, $user_identity;
+	global $user_login, $userdata, $user_level, $user_ID, $user_email, $user_url, $user_pass_md5, $user_identity;
 
 	if ( !isset($_COOKIE['wordpressuser_' . COOKIEHASH])) 
 		return false;
@@ -15,7 +15,6 @@ function get_currentuserinfo() {
 	$userdata    = get_userdatabylogin($user_login);
 	$user_level  = $userdata->user_level;
 	$user_ID     = $userdata->ID;
-	$user_id     = $userdata->ID;
 	$user_email  = $userdata->user_email;
 	$user_url    = $userdata->user_url;