Ticket #45178: 45178.20.diff

src/wp-admin/about.php

@@ -335 +335 @@
                                         <p><?php _e( 'Note to users of assistive technology: if you experience usability issues with the block editor, we recommend you continue to use the Classic Editor.' ); ?></p>
                                         <?php if ( current_user_can( 'install_plugins' ) ) { ?>
                                                 <div class="col cta">
-                                                        <a class="button button-primary button-hero" href="<?php echo esc_url( wp_nonce_url( self_admin_url( 'plugin-install.php?tab=favorites&user=wordpressdotorg' ), 'save_wporg_username_' . get_current_user_id() ) ); ?>"><?php _e( 'Install the Classic Editor' ); ?></a>
+                                                        <a class="button button-primary button-hero" href="<?php echo esc_url( wp_nonce_url( self_admin_url( 'plugin-install.php?tab=favorites&user=wordpressdotorg&save=0' ), 'save_wporg_username_' . get_current_user_id() ) ); ?>"><?php _e( 'Install the Classic Editor' ); ?></a>
                                                 </div>
                                         <?php } ?>
                                 </div>

src/wp-admin/includes/class-wp-plugin-install-list-table.php

@@ -190 +190 @@
                                 $action = 'save_wporg_username_' . get_current_user_id();
                                 if ( isset( $_GET['_wpnonce'] ) && wp_verify_nonce( wp_unslash( $_GET['_wpnonce'] ), $action ) ) {
                                         $user = isset( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
-                                        update_user_meta( get_current_user_id(), 'wporg_favorites', $user );
+
+                                        // If the save url parameter is passed with a falsey value, don't save the favorite user.
+                                        if ( ! isset( $_GET['save'] ) || $_GET['save'] ) {
+                                                update_user_meta( get_current_user_id(), 'wporg_favorites', $user );
+                                        }
                                 } else {
                                         $user = get_user_option( 'wporg_favorites' );
                                 }