Changeset 8731

Timestamp:

08/25/2008 09:09:26 PM (18 years ago)

Author:

ryan

Message:

Don't ignore scheme when cookie value is empty. Props bendalton. fixes #7521

File:

• trunk/wp-includes/pluggable.php (modified) (2 diffs)

trunk/wp-includes/pluggable.php

@@ -485 +485 @@
  * @return bool|int False if invalid cookie, User ID if valid.
  */
-function wp_validate_auth_cookie($cookie = '', $scheme = 'auth') {
+function wp_validate_auth_cookie($cookie = '', $scheme = '') {
         if ( ! $cookie_elements = wp_parse_auth_cookie($cookie, $scheme) ) {
                 do_action('auth_cookie_malformed', $cookie, $scheme);
@@ -560 +560 @@
  * @return array Authentication cookie components
  */
-function wp_parse_auth_cookie($cookie = '', $scheme = 'auth') {
+function wp_parse_auth_cookie($cookie = '', $scheme = '') {
         if ( empty($cookie) ) {
-                if ( is_ssl() ) {
-                        $cookie_name = SECURE_AUTH_COOKIE;
-                        $scheme = 'secure_auth';
-                } else {
-                        $cookie_name = AUTH_COOKIE;
-                        $scheme = 'auth';
-                }
+                switch ($scheme){
+                        case 'auth':
+                                $cookie_name = AUTH_COOKIE;
+                                break;
+                        case 'secure_auth':
+                                $cookie_name = SECURE_AUTH_COOKIE;
+                                break;
+                        case "logged_in":
+                                $cookie_name = LOGGED_IN_COOKIE;
+                                break;
+                        default:
+                                if ( is_ssl() ) {
+                                        $cookie_name = SECURE_AUTH_COOKIE;
+                                        $scheme = 'secure_auth';
+                                } else {
+                                        $cookie_name = AUTH_COOKIE;
+                                        $scheme = 'auth';
+                                }
+            }
 
                 if ( empty($_COOKIE[$cookie_name]) )