Changeset 25045

Timestamp:

08/17/2013 01:00:25 AM (11 years ago)

Author:

azaozz

Message:

In wp-login.php check if cookies are enabled before attempting to log the user in with wp_signon(), fixes #24961.

File:

• trunk/src/wp-login.php (modified) (2 diffs)

trunk/src/wp-login.php

@@ -620 +620 @@
         $secure_cookie = false;
 
-    $user = wp_signon('', $secure_cookie);
+    // 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);
 
     $redirect_to = apply_filters('login_redirect', $redirect_to, isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '', $user);
@@ -655 +659 @@
     if ( !empty($_GET['loggedout']) || $reauth )
         $errors = new WP_Error();
-
-    // If cookies are disabled we can't log in even with a valid user+pass
-    if ( isset($_POST['testcookie']) && empty($_COOKIE[TEST_COOKIE]) )
-        $errors->add('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."));
 
     if ( $interim_login ) {