Ticket #14949: 14949.3.diff

src/wp-login.php

@@ -1182 +1182 @@
 
                 $user = wp_signon( array(), $secure_cookie );
 
+                if ( is_wp_error( $user ) && is_user_logged_in() ) {
+                        $user = wp_get_current_user();
+                }
+
                 if ( empty( $_COOKIE[ LOGGED_IN_COOKIE ] ) ) {
                         if ( headers_sent() ) {
                                 $user = new WP_Error(