Changeset 38619 for trunk/src/wp-admin/install.php

Timestamp:

09/18/2016 11:41:53 AM (10 years ago)

Author:

johnbillion

Message:

Upgrade/Install: Automatically log users in after installation.

This change means that after entering their site's settings upon installation, users are immediately logged in and redirected to the admin dashboard, instead of being presented with the 'Success!' screen and then being asked to log in. This reduces friction and reduces the number of steps for installation.

Fixes #34084

File:

• trunk/src/wp-admin/install.php (modified) (3 diffs)

trunk/src/wp-admin/install.php

@@ -331 +331 @@
                 $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'] ) ) : '';
@@ -344 +343 @@
                 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;
@@ -366 +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();
 ?>