Changeset 43952

Timestamp:

11/30/2018 04:22:46 PM (6 years ago)

Author:

melchoyce

Message:

Help/About: Fix the user's saved WordPress.org username from being changed to wordpressdotorg when they click the About page link to install the Classic Editor plugin.

Props pento.
See #45178.

Location:

branches/5.0/src/wp-admin

Files:

• about.php (modified) (1 diff)
• includes/class-wp-plugin-install-list-table.php (modified) (1 diff)

branches/5.0/src/wp-admin/about.php

@@ -336 +336 @@
                     <?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 } ?>

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

@@ -191 +191 @@
                 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' );