Ticket #33699: 33699.3.diff

src/wp-admin/install.php

@@ -371 +371 @@
 ?>
 <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 ( 1 == $step ) {
+        wp_print_scripts( 'user-profile' );
+} else if ( 0 == $step ) {
+        wp_print_scripts( 'language-chooser' );
+} else {
+        wp_print_scripts( 'jquery' );
+} ?>
 <script type="text/javascript">
 jQuery( function( $ ) {
         $( '.hide-if-no-js' ).removeClass( 'hide-if-no-js' );

src/wp-admin/js/user-profile.js

@@ -195 +195 @@
                         }
                 } );
 
+                $toggleButton = $pass1Row.find('.wp-hide-pw');
+
                 // Disable the hidden inputs to prevent autofill and submission.
-                $pass1.prop( 'disabled', true );
-                $pass2.prop( 'disabled', true );
-                $pass1Text.prop( 'disabled', true );
+                if ( 1 !== parseInt( $toggleButton.data( 'start-masked' ), 10 ) ) {
+                        $pass1.prop( 'disabled', false );
+                        $pass2.prop( 'disabled', false );
+                        $pass1Text.prop( 'disabled', false );
+                } else {
+                        $pass1.prop( 'disabled', true );
+                        $pass2.prop( 'disabled', true );
+                        $pass1Text.prop( 'disabled', true );
+                }
 
                 $passwordWrapper = $pass1Row.find( '.wp-pwd' );
                 $generateButton  = $pass1Row.find( 'button.wp-generate-pw' );