Ticket #2039: 2039.refreshed.diff

wp-login.php

@@ -20 +20 @@
-                update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) );
-}
-
+//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
-function login_header($title = 'Login', $message = '') {
@@ -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 ) ) {
-                $user = new WP_User(0, $user_login);
-

wp-settings.php

@@ -206 +206 @@
-        define('USER_COOKIE', 'wordpressuser_'. COOKIEHASH);
-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') . '/' ) );
-if ( !defined('SITECOOKIEPATH') )