Changeset 2634

Show
Ignore:
Timestamp:
06/13/05 00:05:41 (4 years ago)
Author:
matt
Message:

More user fixups

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-admin/menu-header.php

    r2458 r2634  
    2222?> 
    2323    <li class="last"><a href="<?php echo get_settings('siteurl') 
    24      ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account') ?>"><?php printf(__('Logout (%s)'), $user_nickname) ?></a></li> 
     24     ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account') ?>"><?php printf(__('Logout (%s)'), $user_identity) ?></a></li> 
    2525</ul> 
    2626 

  • trunk/wp-includes/pluggable-functions.php

    r2633 r2634  
    77if ( !function_exists('get_currentuserinfo') ) : 
    88function get_currentuserinfo() { 
    9     global $user_login, $userdata, $user_level, $user_ID, $user_nickname, $user_email, $user_url, $user_pass_md5, $user_identity; 
    10     // *** retrieving user's data from cookies and db - no spoofing 
    11  
    12     if (isset($_COOKIE['wordpressuser_' . COOKIEHASH]))  
    13         $user_login = $_COOKIE['wordpressuser_' . COOKIEHASH]; 
    14     $userdata = get_userdatabylogin($user_login); 
    15     $user_level = $userdata->user_level; 
    16     $user_ID = $userdata->ID; 
    17     $user_nickname = $userdata->user_nickname; 
    18     $user_email = $userdata->user_email; 
    19     $user_url = $userdata->user_url; 
     9    global $user_login, $userdata, $user_level, $user_ID, $user_id, $user_email, $user_url, $user_pass_md5, $user_identity; 
     10 
     11    if ( !isset($_COOKIE['wordpressuser_' . COOKIEHASH]))  
     12        return false; 
     13 
     14    $user_login  = $_COOKIE['wordpressuser_' . COOKIEHASH]; 
     15    $userdata    = get_userdatabylogin($user_login); 
     16    $user_level  = $userdata->user_level; 
     17    $user_ID     = $userdata->ID; 
     18    $user_id     = $userdata->ID; 
     19    $user_email  = $userdata->user_email; 
     20    $user_url    = $userdata->user_url; 
     21 
    2022    $user_pass_md5 = md5($userdata->user_pass); 
    2123 
    22     $idmode = $userdata->user_idmode; 
    23     if ($idmode == 'nickname')  $user_identity = $userdata->user_nickname; 
    24     if ($idmode == 'login')     $user_identity = $userdata->user_login; 
    25     if ($idmode == 'firstname') $user_identity = $userdata->user_firstname; 
    26     if ($idmode == 'lastname')  $user_identity = $userdata->user_lastname; 
    27     if ($idmode == 'namefl')    $user_identity = $userdata->user_firstname.' '.$userdata->user_lastname; 
    28     if ($idmode == 'namelf')    $user_identity = $userdata->user_lastname.' '.$userdata->user_firstname; 
    29     if (!$idmode) $user_identity = $userdata->user_nickname; 
     24    $user_identity = $userdata->display_name; 
    3025} 
    3126endif;