Changeset 64239

Timestamp:

10/08/2026 09:31:43 AM (31 hours ago)

Author:

afercia

Message:

Users: Prevent duplicate email change admin notices on multisite.

Follow-up to [64228].

• Remove duplicate admin notices hooked from ms-admin-filters.php.
• Update @since tag for the new_user_email_admin_notice() docblock.
• Add unit tests for new_user_email_admin_notice().

Developed in ​https://github.com/WordPress/wordpress-develop/pull/14086

Props ravipatel.
Fixes #66173.

Location:

trunk

Files:

• src/wp-admin/includes/ms-admin-filters.php (modified) (1 diff)
• src/wp-includes/user.php (modified) (2 diffs)
• tests/phpunit/tests/user/newUserEmailAdminNotice.php (added)

trunk/src/wp-admin/includes/ms-admin-filters.php

@@ -12 +12 @@
 
 // User hooks.
-add_action( 'user_admin_notices', 'new_user_email_admin_notice' );
-add_action( 'network_admin_notices', 'new_user_email_admin_notice' );
-
 add_action( 'admin_page_access_denied', '_access_denied_splash', 99 );
 

trunk/src/wp-includes/user.php

@@ -4012 +4012 @@
  * @since 3.0.0
  * @since 4.9.0 This function was moved from wp-admin/includes/ms.php so it's no longer Multisite specific.
+ * @since 7.2.0 The notice is displayed whenever an email change is pending, not only after updating
+ *              the profile, and includes a link to cancel the request. The function is no longer
+ *              hooked to the `admin_notices`, `user_admin_notices`, and `network_admin_notices`
+ *              actions, and is instead called directly from wp-admin/user-edit.php.
  *
  * @global string $pagenow The filename of the current screen.
@@ -4030 +4034 @@
                                 ' <a href="%1$s">%2$s</a>',
                                 esc_url( wp_nonce_url( self_admin_url( 'profile.php?dismiss=' . $current_user_id . '_new_email' ), 'dismiss-' . $current_user_id . '_new_email' ) ),
-                                _x( 'Cancel request', 'user email change' ),
+                                _x( 'Cancel request', 'user email change' )
                         );
                         wp_admin_notice( $message, array( 'type' => 'info' ) );