Ticket #33850: 33850.patch

user-edit.php

@@ -450 +450 @@
         <th><label for="pass1"><?php _e( 'New Password' ); ?></label></th>
         <td>
                 <input class="hidden" value=" " /><!-- #24364 workaround -->
-                <button type="button" class="button button-secondary wp-generate-pw hide-if-no-js"><?php _e( 'Generate Password' ); ?></button>
+                <button type="button" id="wp-generate-pw" class="button button-secondary wp-generate-pw hide-if-no-js"><?php _e( 'Generate Password' ); ?></button>
                 <div class="wp-pwd hide-if-js">
                         <span class="password-input-wrapper">
                                 <input type="password" name="pass1" id="pass1" class="regular-text" value="" autocomplete="off" data-pw="<?php echo esc_attr( wp_generate_password( 24 ) ); ?>" aria-describedby="pass-strength-result" />

js/user-profile.js

@@ -153 +153 @@
                         $cancelButton;
 
                 $pass1Row = $('.user-pass1-wrap');
-                $pass1Label = $pass1Row.find('th label').attr( 'for', 'pass1-text' );
+                $generateButton = $pass1Row.find( 'button.wp-generate-pw' ); 
+                
+                if( $generateButton.length )                    
+                        $pass1Label = $pass1Row.find('th label').attr( 'for', 'wp-generate-pw' );
+                else
+                        $pass1Label = $pass1Row.find('th label').attr( 'for', 'pass1-text' );
 
                 // hide this
                 $('.user-pass2-wrap').hide();
@@ -223 +228 @@
                         // Clear password field to prevent update
                         $pass1.val( '' ).trigger( 'pwupdate' );
                         $submitButtons.prop( 'disabled', false );
+                        $pass1Row.find('th').children('label').attr({'for':'wp-generate-pw'});
                 } );
 
                 $pass1Row.closest('form').on( 'submit', function () {