Changeset 40321

Timestamp:

03/23/2017 07:02:23 PM (8 years ago)

Author:

johnbillion

Message:

Login and Registration: Avoid a potentially incorrect value for the cookie hash on multisite installations that don't have a value in the siteurl network option.

This reverts [38619].

See #34084, #39497

Merges [40320] to the 4.7 branch.

Location:

branches/4.7

Files:

• . (modified) (1 prop)
• src/wp-admin/install.php (modified) (3 diffs)
• src/wp-includes/default-constants.php (modified) (1 diff)

branches/4.7/src/wp-admin/install.php

@@ -335 +335 @@
         $scripts_to_print[] = 'user-profile';
 
+        display_header();
         // Fill in the data we gathered
         $weblog_title = isset( $_POST['weblog_title'] ) ? trim( wp_unslash( $_POST['weblog_title'] ) ) : '';
@@ -347 +348 @@
         if ( empty( $user_name ) ) {
             // TODO: poka-yoke
-            display_header();
             display_setup_form( __( 'Please provide a valid username.' ) );
             $error = true;
         } elseif ( $user_name != sanitize_user( $user_name, true ) ) {
-            display_header();
             display_setup_form( __( 'The username you provided has invalid characters.' ) );
             $error = true;
         } elseif ( $admin_password != $admin_password_check ) {
             // TODO: poka-yoke
-            display_header();
             display_setup_form( __( 'Your passwords do not match. Please try again.' ) );
             $error = true;
         } elseif ( empty( $admin_email ) ) {
             // TODO: poka-yoke
-            display_header();
             display_setup_form( __( 'You must provide an email address.' ) );
             $error = true;
         } elseif ( ! is_email( $admin_email ) ) {
             // TODO: poka-yoke
-            display_header();
             display_setup_form( __( 'Sorry, that isn&#8217;t a valid email address. Email addresses look like <code>username@example.com</code>.' ) );
             $error = true;
@@ -374 +370 @@
             $wpdb->show_errors();
             $result = wp_install( $weblog_title, $user_name, $admin_email, $public, '', wp_slash( $admin_password ), $loaded_language );
-
-            // Log the user in and send them to wp-admin:
-            if ( ! headers_sent() ) {
-                wp_set_auth_cookie( $result['user_id'], true, is_ssl() );
-                wp_redirect( admin_url() );
-                exit;
-            }
-
-            // If headers have already been sent, fall back to a "Success!" message:
-            display_header();
 ?>
 

branches/4.7/src/wp-includes/default-constants.php

@@ -206 +206 @@
             define( 'COOKIEHASH', md5( $siteurl ) );
         else
-            define( 'COOKIEHASH', md5( wp_guess_url() ) );
+            define( 'COOKIEHASH', '' );
     }