Ticket #34700: 34700.2.diff

src/wp-admin/install.php

@@ -263 +263 @@
 switch($step) {
         case 0: // Step 0
 
+                $skip_step_0 = true;
                 if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
+                        $skip_step_0 = false;
                         display_header( 'language-chooser' );
                         echo '<form id="setup" method="post" action="?step=1">';
                         wp_install_language_form( $languages );
@@ -370 +372 @@
 if ( !wp_is_mobile() ) {
 ?>
 <script type="text/javascript">var t = document.getElementById('weblog_title'); if (t){ t.focus(); }</script>
-<?php } ?>
-<?php wp_print_scripts( 'user-profile' ); ?>
-<?php wp_print_scripts( 'language-chooser' ); ?>
+<?php }
+
+switch ( $step ) {
+        case 0:
+                if ( ! $skip_step_0 ) {
+                        wp_print_scripts( 'language-chooser' );
+                        break;
+                }
+        case 1:
+                wp_print_scripts( 'user-profile' );
+                ?>
 <script type="text/javascript">
 jQuery( function( $ ) {
         $( '.hide-if-no-js' ).removeClass( 'hide-if-no-js' );
 } );
 </script>
+                <?php
+                break;
+}
+?>
 </body>
 </html>