Make WordPress Core


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

current user cleanup

File:
1 edited

Legend:

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

    r3549 r3566  
    2828
    2929function wp_loginout() {
    30     global $user_ID;
    31     get_currentuserinfo();
    32 
    33     if ('' == $user_ID)
     30    if ( ! is_user_logged_in() )
    3431        $link = '<a href="' . get_settings('siteurl') . '/wp-login.php">' . __('Login') . '</a>';
    3532    else
     
    4138
    4239function wp_register( $before = '<li>', $after = '</li>' ) {
    43     global $user_ID;
    44 
    45     get_currentuserinfo();
    46 
    47     if ( '' == $user_ID && get_settings('users_can_register') )
    48         $link = $before . '<a href="' . get_settings('siteurl') . '/wp-register.php">' . __('Register') . '</a>' . $after;
    49     elseif ( '' == $user_ID && !get_settings('users_can_register') )
    50         $link = '';
    51     else
     40
     41    if ( ! is_user_logged_in() ) {
     42        if ( get_settings('users_can_register') )
     43            $link = $before . '<a href="' . get_settings('siteurl') . '/wp-register.php">' . __('Register') . '</a>' . $after;
     44        else
     45            $link = '';
     46    } else {
    5247        $link = $before . '<a href="' . get_settings('siteurl') . '/wp-admin/">' . __('Site Admin') . '</a>' . $after;
     48    }
    5349
    5450    echo apply_filters('register', $link);
Note: See TracChangeset for help on using the changeset viewer.