Ticket #34700: 34700.3.diff

src/wp-admin/install.php

@@ -261 +261 @@
         $language = $GLOBALS['wp_local_package'];
 }
 
+$scripts_to_print = array();
+
 switch($step) {
         case 0: // Step 0
-
                 if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
+                        $scripts_to_print[] = 'language-chooser';
                         display_header( 'language-chooser' );
                         echo '<form id="setup" method="post" action="?step=1">';
                         wp_install_language_form( $languages );
@@ -283 +285 @@
                         }
                 }
 
+                $scripts_to_print[] = 'user-profile';
+
                 display_header();
 ?>
 <h1><?php _ex( 'Welcome', 'Howdy' ); ?></h1>
@@ -305 +309 @@
                 if ( ! empty( $wpdb->error ) )
                         wp_die( $wpdb->error->get_error_message() );
 
+                $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'] ) ) : '';
@@ -372 +378 @@
 ?>
 <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
+if ( $scripts_to_print ) {
+        wp_print_scripts( $scripts_to_print );
+?>
 <script type="text/javascript">
 jQuery( function( $ ) {
         $( '.hide-if-no-js' ).removeClass( 'hide-if-no-js' );
 } );
 </script>
+<?php }
+?>
 </body>
 </html>