IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@2644 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan
2005-06-16 06:27:30 +00:00
parent f220786deb
commit 2c44f33f78
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wp-includes/pluggable-functions.php
View File

@@ -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;