Make WordPress Core


Ignore:
Timestamp:
02/22/2006 07:08:55 PM (18 years ago)
Author:
ryan
Message:

current user cleanup

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/pluggable-functions.php

    r3565 r3566  
    66if ( !function_exists('set_current_user') ) :
    77function set_current_user($id, $name = '') {
    8     global $user_login, $userdata, $user_level, $user_ID, $user_email, $user_url, $user_pass_md5, $user_identity, $current_user;
    9 
    10     $current_user   = '';
    11 
    12     $current_user   = new WP_User($id, $name);
    13 
    14     $userdata   = get_userdatabylogin($user_login);
    15 
    16     $user_login = $userdata->user_login;
    17     $user_level = $userdata->user_level;
    18     $user_ID    = $userdata->ID;
    19     $user_email = $userdata->user_email;
    20     $user_url   = $userdata->user_url;
    21     $user_pass_md5  = md5($userdata->user_pass);
    22     $user_identity  = $userdata->display_name;
     8    return wp_set_current_user($id, $name);
     9}
     10endif;
     11
     12if ( !function_exists('wp_set_current_user') ) :
     13function wp_set_current_user($id, $name = '') {
     14    global $current_user;
     15
     16    if ( isset($current_user) && ($id == $current_user->ID) )
     17        return $current_user;
     18
     19    $current_user = new WP_User($id, $name);
     20
     21    setup_userdata($current_user->ID);
    2322
    2423    do_action('set_current_user');
     
    2827endif;
    2928
     29if ( !function_exists('current_user') ) :
     30function wp_get_current_user() {
     31    global $current_user;
     32
     33    get_currentuserinfo();
     34
     35    return $current_user;
     36}
     37endif;
    3038
    3139if ( !function_exists('get_currentuserinfo') ) :
    3240function get_currentuserinfo() {
    33     global $user_login, $userdata, $user_level, $user_ID, $user_email, $user_url, $user_pass_md5, $user_identity, $current_user;
     41    global $current_user;
    3442
    3543    if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST )
    3644        return false;
     45
     46    if ( ! empty($current_user) )
     47        return;
    3748
    3849    if ( empty($_COOKIE[USER_COOKIE]) || empty($_COOKIE[PASS_COOKIE]) ||
    3950        !wp_login($_COOKIE[USER_COOKIE], $_COOKIE[PASS_COOKIE], true) ) {
    40         $current_user = new WP_User(0);
    41         return false;
    42     }
    43     $user_login  = $_COOKIE[USER_COOKIE];
    44     $userdata    = get_userdatabylogin($user_login);
    45     $user_level  = $userdata->user_level;
    46     $user_ID     = $userdata->ID;
    47     $user_email  = $userdata->user_email;
    48     $user_url    = $userdata->user_url;
    49     $user_pass_md5 = md5($userdata->user_pass);
    50     $user_identity = $userdata->display_name;
    51 
    52     if ( empty($current_user) )
    53         $current_user = new WP_User($user_ID);
     51        wp_set_current_user(0);
     52        return false;
     53    }
     54
     55    $user_login = $_COOKIE[USER_COOKIE];
     56    wp_set_current_user(0, $user_login);
    5457}
    5558endif;
     
    202205if ( !function_exists('is_user_logged_in') ) :
    203206function is_user_logged_in() {
    204     global $current_user;
    205 
    206     if ( $current_user->id == 0 )
    207         return false;
     207    $user = wp_get_current_user();
     208
     209    if ( $user->id == 0 )
     210        return false;
     211
    208212    return true;
    209213}
Note: See TracChangeset for help on using the changeset viewer.