Changeset 27859

Timestamp:

03/30/2014 12:40:43 AM (11 years ago)

Author:

nacin

Message:

Only show test cookie warnings on submit as caching/proxies may intercept the test cookie for GET requests.

Introduce a new string for when headers are sent and link them to ​http://codex.wordpress.org/Cookies (new page).

props SergeyBiryukov.
fixes #27373.

File:

• trunk/src/wp-login.php (modified) (1 diff)

trunk/src/wp-login.php

@@ -756 +756 @@
         $secure_cookie = false;
 
-    // If cookies are disabled we can't log in even with a valid user+pass
-    if ( isset($_POST['testcookie']) && empty($_COOKIE[TEST_COOKIE]) )
-        $user = new WP_Error('test_cookie', __("<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href='http://www.google.com/cookies.html'>enable cookies</a> to use WordPress."));
-    else
-        $user = wp_signon('', $secure_cookie);
+    $user = wp_signon( '', $secure_cookie );
+
+    if ( empty( $_COOKIE[ LOGGED_IN_COOKIE ] ) ) {
+        if ( headers_sent() ) {
+            $user = new WP_Error( 'test_cookie', sprintf( __( '<strong>ERROR</strong>: Cookies are blocked due to unexpected output. For help, please see <a href="%1$s">this documentation</a> or try the <a href="%2$s">support forums</a>.' ),
+                __( 'http://codex.wordpress.org/Cookies' ), __( 'https://wordpress.org/support/' ) ) );
+        } elseif ( isset( $_POST['testcookie'] ) && empty( $_COOKIE[ TEST_COOKIE ] ) ) {
+            // If cookies are disabled we can't log in even with a valid user+pass
+            $user = new WP_Error( 'test_cookie', sprintf( __( '<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href="%s">enable cookies</a> to use WordPress.' ),
+                __( 'http://codex.wordpress.org/Cookies' ) ) );
+        }
+    }
 
     $requested_redirect_to = isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';