WordPress 4.7.2

[autoinstalls/wordpress.git] / wp-admin / install.php

diff --git a/wp-admin/install.php b/wp-admin/install.php
index 240398204674c6902605fd803827de0b24253e15..ed9d06d19c6dd631b758d98e448d3a0ec9e8e21b 100644 (file)
--- a/wp-admin/install.php
+++ b/wp-admin/install.php
@@ -141,7 +141,7 @@ function display_setup_form( $error = null ) {
                                <div class="">
                                        <?php $initial_password = isset( $_POST['admin_password'] ) ? stripslashes( $_POST['admin_password'] ) : wp_generate_password( 18 ); ?>
                                        <input type="password" name="admin_password" id="pass1" class="regular-text" autocomplete="off" data-reveal="1" data-pw="<?php echo esc_attr( $initial_password ); ?>" aria-describedby="pass-strength-result" />
-                                       <button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-start-masked="<?php echo (int) isset( $_POST['admin_password'] ); ?>" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
+                                       <button type="button" class="button wp-hide-pw hide-if-no-js" data-start-masked="<?php echo (int) isset( $_POST['admin_password'] ); ?>" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
                                                <span class="dashicons dashicons-hidden"></span>
                                                <span class="text"><?php _e( 'Hide' ); ?></span>
                                        </button>
@@ -232,12 +232,16 @@ $mysql_version  = $wpdb->db_version();
 $php_compat     = version_compare( $php_version, $required_php_version, '>=' );
 $mysql_compat   = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
 
-if ( !$mysql_compat && !$php_compat )
+if ( !$mysql_compat && !$php_compat ) {
+       /* translators: 1: WordPress version number, 2: Minimum required PHP version number, 3: Minimum required MySQL version number, 4: Current PHP version number, 5: Current MySQL version number */
        $compat = sprintf( __( 'You cannot install because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.' ), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
-elseif ( !$php_compat )
+} elseif ( !$php_compat ) {
+       /* translators: 1: WordPress version number, 2: Minimum required PHP version number, 3: Current PHP version number */
        $compat = sprintf( __( 'You cannot install because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_php_version, $php_version );
-elseif ( !$mysql_compat )
+} elseif ( !$mysql_compat ) {
+       /* translators: 1: WordPress version number, 2: Minimum required MySQL version number, 3: Current MySQL version number */
        $compat = sprintf( __( 'You cannot install because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_mysql_version, $mysql_version );
+}
 
 if ( !$mysql_compat || !$php_compat ) {
        display_header();
@@ -330,7 +334,6 @@ switch($step) {
 
                $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'] ) ) : '';
                $user_name = isset($_POST['user_name']) ? trim( wp_unslash( $_POST['user_name'] ) ) : '';
@@ -343,21 +346,26 @@ switch($step) {
                $error = false;
                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;
                }
@@ -365,6 +373,16 @@ switch($step) {
                if ( $error === false ) {
                        $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();
 ?>
 
 <h1><?php _e( 'Success!' ); ?></h1>