Index: /trunk/src/wp-admin/includes/ms-admin-filters.php =================================================================== --- /trunk/src/wp-admin/includes/ms-admin-filters.php (revision 64238) +++ /trunk/src/wp-admin/includes/ms-admin-filters.php (revision 64239) @@ -12,7 +12,4 @@ // 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 ); Index: /trunk/src/wp-includes/user.php =================================================================== --- /trunk/src/wp-includes/user.php (revision 64238) +++ /trunk/src/wp-includes/user.php (revision 64239) @@ -4012,4 +4012,8 @@ * @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,5 +4034,5 @@ ' %2$s', 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' ) ); Index: /trunk/tests/phpunit/tests/user/newUserEmailAdminNotice.php =================================================================== --- /trunk/tests/phpunit/tests/user/newUserEmailAdminNotice.php (revision 64239) +++ /trunk/tests/phpunit/tests/user/newUserEmailAdminNotice.php (revision 64239) @@ -0,0 +1,174 @@ +user->create( + array( + 'role' => 'subscriber', + 'user_email' => 'before@example.com', + ) + ); + } + + /** + * Set up before each test. + */ + public function set_up() { + parent::set_up(); + + $this->original_pagenow = $GLOBALS['pagenow'] ?? null; + wp_set_current_user( self::$user_id ); + } + + /** + * Tear down after each test. + */ + public function tear_down() { + $GLOBALS['pagenow'] = $this->original_pagenow; + unset( $_GET['updated'] ); + + parent::tear_down(); + } + + /** + * Stores a pending email change for the test user. + */ + private function set_pending_email_change() { + update_user_meta( + self::$user_id, + '_new_email', + array( + 'hash' => md5( 'after@example.com' ), + 'newemail' => 'after@example.com', + ) + ); + } + + /** + * Tests that the notice is displayed when an email change is pending. + * + * @ticket 66173 + */ + public function test_should_display_notice_when_email_change_is_pending() { + $GLOBALS['pagenow'] = 'profile.php'; + $this->set_pending_email_change(); + + $output = get_echo( 'new_user_email_admin_notice' ); + + $this->assertStringContainsString( 'notice-info', $output, 'The notice should be of type "info".' ); + $this->assertStringContainsString( 'after@example.com', $output, 'The notice should contain the new email address.' ); + } + + /** + * Tests that the notice is displayed regardless of the "updated" query arg. + * + * @ticket 66173 + */ + public function test_should_display_notice_regardless_of_updated_query_arg() { + $GLOBALS['pagenow'] = 'profile.php'; + $this->set_pending_email_change(); + + unset( $_GET['updated'] ); + $this->assertNotEmpty( get_echo( 'new_user_email_admin_notice' ), 'The notice should display when the "updated" query arg is absent.' ); + + $_GET['updated'] = 'true'; + $this->assertNotEmpty( get_echo( 'new_user_email_admin_notice' ), 'The notice should display when the "updated" query arg is present.' ); + } + + /** + * Tests that the notice includes a nonced link to cancel the email change request. + * + * @ticket 66173 + */ + public function test_should_include_cancel_request_link() { + $GLOBALS['pagenow'] = 'profile.php'; + $this->set_pending_email_change(); + + $output = get_echo( 'new_user_email_admin_notice' ); + + $this->assertStringContainsString( 'dismiss=' . self::$user_id . '_new_email', $output, 'The notice should link to the dismiss action.' ); + $this->assertStringContainsString( '_wpnonce=', $output, 'The cancel link should be nonced.' ); + $this->assertStringContainsString( 'Cancel request', $output, 'The cancel link text should be "Cancel request".' ); + } + + /** + * Tests that the notice is not displayed when no email change is pending. + * + * @ticket 66173 + */ + public function test_should_not_display_notice_without_pending_email_change() { + $GLOBALS['pagenow'] = 'profile.php'; + + $this->assertSame( '', get_echo( 'new_user_email_admin_notice' ) ); + } + + /** + * Tests that the notice is not displayed outside the profile screen. + * + * @ticket 66173 + */ + public function test_should_not_display_notice_outside_profile_screen() { + $GLOBALS['pagenow'] = 'index.php'; + $this->set_pending_email_change(); + + $this->assertSame( '', get_echo( 'new_user_email_admin_notice' ) ); + } + + /** + * Tests that the notice is not hooked to multisite admin notice actions. + * + * Ensures the notice is not output a second time through the multisite + * admin notice actions, since wp-admin/user-edit.php renders it directly. + * + * @ticket 66173 + * + * @group ms-required + * + * @dataProvider data_multisite_admin_notice_actions + * + * @param string $hook_name Admin notice action name. + */ + public function test_should_not_be_hooked_to_multisite_admin_notice_actions( $hook_name ) { + require_once ABSPATH . 'wp-admin/includes/ms-admin-filters.php'; + + $this->assertFalse( has_action( $hook_name, 'new_user_email_admin_notice' ) ); + } + + /** + * Data provider. + * + * @return array[] + */ + public function data_multisite_admin_notice_actions() { + return array( + 'user_admin_notices' => array( 'user_admin_notices' ), + 'network_admin_notices' => array( 'network_admin_notices' ), + ); + } +}