Ticket #54538: 54538-2.diff

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

@@ -216 +216 @@
                         updateLock = true;
 
                         // Make sure the password fields are shown.
-                        $generateButton.attr( 'aria-expanded', 'true' );
+                        $generateButton.not( '.skip-aria-expanded' ).attr( 'aria-expanded', 'true' );
                         $passwordWrapper
                                 .show()
                                 .addClass( 'is-open' );
@@ -257 +257 @@
 
                         // Stop an empty password from being submitted as a change.
                         $submitButtons.prop( 'disabled', false );
+
+                        $generateButton.attr( 'aria-expanded', 'false' );
                 } );
 
                 $pass1Row.closest( 'form' ).on( 'submit', function () {

src/wp-login.php

@@ -970 +970 @@
                         ?>
                         <input type="hidden" name="rp_key" value="<?php echo esc_attr( $rp_key ); ?>" />
                         <p class="submit reset-pass-submit">
-                                <button type="button" class="button wp-generate-pw hide-if-no-js" aria-expanded="true"><?php _e( 'Generate Password' ); ?></button>
+                                <button type="button" class="button wp-generate-pw hide-if-no-js skip-aria-expanded"><?php _e( 'Generate Password' ); ?></button>
                                 <input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e( 'Save Password' ); ?>" />
                         </p>
                 </form>