Changeset 6009

Timestamp:

09/02/2007 05:20:37 PM (17 years ago)

Author:

westi

Message:

Inform the user when cookies are disabled and login fails. Fixed #2039 props tellyworth.

Location:

trunk

Files:

• wp-login.php (modified) (2 diffs)
• wp-settings.php (modified) (1 diff)

trunk/wp-login.php

@@ -21 +21 @@
 }
 
+//Set a cookie now to see if they are supported by the browser.
+setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN);
 
 // Rather than duplicating this HTML all over the place, we'll stick it in function
@@ -307 +309 @@
 
     do_action_ref_array('wp_authenticate', array(&$user_login, &$user_pass));
+
+    // If cookies are disabled we can't log in even with a valid user+pass
+    if ( $_POST && empty($_COOKIE[TEST_COOKIE]) )
+        $errors['test_cookie'] = __('<strong>ERROR</strong>: WordPress requires Cookies but your browser does not support them or they are blocked.');
 
     if ( $user_login && $user_pass && empty( $errors ) ) {

trunk/wp-settings.php

@@ -207 +207 @@
 if ( !defined('PASS_COOKIE') )
     define('PASS_COOKIE', 'wordpresspass_'. COOKIEHASH);
+if ( !defined('TEST_COOKIE') )
+    define('TEST_COOKIE', 'wordpress_test_cookie');
 if ( !defined('COOKIEPATH') )
     define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('home') . '/' ) );