diff options
| author | matt <matt@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-07-18 20:12:58 +0000 |
|---|---|---|
| committer | matt <matt@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-07-18 20:12:58 +0000 |
| commit | 56a6c3ffd89be6cf7f482983b80e34fb8f38346b (patch) | |
| tree | cb64b6cd79c8aa02864a8b72280a45f33c16a300 /wp-inst/wp-includes/pluggable-functions.php | |
| parent | 987d9d09b813bf26661ea0735f2c9d4ec5cedd23 (diff) | |
More cookie catchups
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@43 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-includes/pluggable-functions.php')
| -rw-r--r-- | wp-inst/wp-includes/pluggable-functions.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wp-inst/wp-includes/pluggable-functions.php b/wp-inst/wp-includes/pluggable-functions.php index b76b263..c5cfa96 100644 --- a/wp-inst/wp-includes/pluggable-functions.php +++ b/wp-inst/wp-includes/pluggable-functions.php @@ -8,10 +8,10 @@ if ( !function_exists('get_currentuserinfo') ) : function get_currentuserinfo() { global $user_login, $userdata, $user_level, $user_ID, $user_email, $user_url, $user_pass_md5, $user_identity, $current_user; - if ( !isset($_COOKIE['wordpressuser_' . COOKIEHASH])) + if ( !isset($_COOKIE[USER_COOKIE])) return false; - $user_login = $_COOKIE['wordpressuser_' . COOKIEHASH]; + $user_login = $_COOKIE[USER_COOKIE]; $userdata = get_userdatabylogin($user_login); $user_level = $userdata->user_level; $user_ID = $userdata->ID; @@ -149,9 +149,9 @@ endif; if ( !function_exists('auth_redirect') ) : function auth_redirect() { // Checks if a user is logged in, if not redirects them to the login page - if ( (!empty($_COOKIE['wordpressuser_' . COOKIEHASH]) && - !wp_login($_COOKIE['wordpressuser_' . COOKIEHASH], $_COOKIE['wordpresspass_' . COOKIEHASH], true)) || - (empty($_COOKIE['wordpressuser_' . COOKIEHASH])) ) { + if ( (!empty($_COOKIE[USER_COOKIE]) && + !wp_login($_COOKIE[USER_COOKIE], $_COOKIE[PASS_COOKIE], true)) || + (empty($_COOKIE[USER_COOKIE])) ) { nocache_headers(); header('Location: ' . get_settings('siteurl') . '/wp-login.php?redirect_to=' . urlencode($_SERVER['REQUEST_URI'])); |