Make WordPress Core

Changeset 6009


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-login.php

    r5998 r6009  
    2121}
    2222
     23//Set a cookie now to see if they are supported by the browser.
     24setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN);
    2325
    2426// Rather than duplicating this HTML all over the place, we'll stick it in function
     
    307309
    308310    do_action_ref_array('wp_authenticate', array(&$user_login, &$user_pass));
     311
     312    // If cookies are disabled we can't log in even with a valid user+pass
     313    if ( $_POST && empty($_COOKIE[TEST_COOKIE]) )
     314        $errors['test_cookie'] = __('<strong>ERROR</strong>: WordPress requires Cookies but your browser does not support them or they are blocked.');
    309315
    310316    if ( $user_login && $user_pass && empty( $errors ) ) {
  • trunk/wp-settings.php

    r5892 r6009  
    207207if ( !defined('PASS_COOKIE') )
    208208    define('PASS_COOKIE', 'wordpresspass_'. COOKIEHASH);
     209if ( !defined('TEST_COOKIE') )
     210    define('TEST_COOKIE', 'wordpress_test_cookie');
    209211if ( !defined('COOKIEPATH') )
    210212    define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('home') . '/' ) );
Note: See TracChangeset for help on using the changeset viewer.