Ticket #33908: password_gen_fix.diff

wp-admin/js/user-profile.js

@@ -190 +190 @@
                         }
                 } );
 
-                $passwordWrapper = $pass1Row.find('.wp-pwd').hide();
+                $passwordWrapper = $pass1Row.find( '.wp-pwd' );
+                $generateButton  = $pass1Row.find( 'button.wp-generate-pw' );
 
                 bindToggleButton();
 
-                $generateButton = $pass1Row.find( 'button.wp-generate-pw' ).show();
+                if( $generateButton.length ) $passwordWrapper.hide();
+
+                $generateButton.show();
                 $generateButton.on( 'click', function () {
                         updateLock = true;
 

wp-login.php

@@ -652 +652 @@
 <form name="resetpassform" id="resetpassform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=resetpass', 'login_post' ) ); ?>" method="post" autocomplete="off">
         <input type="hidden" id="user_login" value="<?php echo esc_attr( $rp_login ); ?>" autocomplete="off" />
 
-        <p class="user-pass1-wrap">
-                <label for="pass1"><?php _e( 'New password' ) ?></label>
-        </p>
+        <div class="user-pass1-wrap">
+                <p>
+                        <label for="pass1"><?php _e( 'New password' ) ?></label>
+                </p>
 
-        <div class="wp-pwd">
-                <span class="password-input-wrapper">
-                        <input type="password" data-reveal="1" data-pw="<?php echo esc_attr( wp_generate_password( 16 ) ); ?>" name="pass1" id="pass1" class="input" size="20" value="" autocomplete="off" aria-describedby="pass-strength-result" />
-                </span>
-                <div id="pass-strength-result" class="hide-if-no-js" aria-live="polite"><?php _e( 'Strength indicator' ); ?></div>
+                <div class="wp-pwd">
+                        <span class="password-input-wrapper">
+                                <input type="password" data-reveal="1" data-pw="<?php echo esc_attr( wp_generate_password( 16 ) ); ?>" name="pass1" id="pass1" class="input" size="20" value="" autocomplete="off" aria-describedby="pass-strength-result" />
+                        </span>
+                        <div id="pass-strength-result" class="hide-if-no-js" aria-live="polite"><?php _e( 'Strength indicator' ); ?></div>
+                </div>
         </div>
 
         <p class="user-pass2-wrap">