Changeset 64228

Timestamp:

10/07/2026 01:40:25 PM (3 hours ago)

Author:

afercia

Message:

Users: Improve the usability and consistency of the admin notices related to email changes.

• Renders an admin 'info' notice in the General Settings page when changing the administration email.
• The notice is similar to the one already rendered in the User Profile when changing the user email.
• Both the notices at the top are now rendered after the 'settings saved' one.
• For both notices:
• The 'Cancel' link text is now a more meaningful 'Cancel request'.
• The 'Cancel request' link is now rendered also in the admin notice at the top.
• The notices in the middle of the page are now of type 'info' instead of 'success'. This is consistent with the notices at the top. Also, the notices content is informative and the previous 'success' type was not appropriate.
• Changes the text of one of the notices by updating the text 'admin email' to 'administration email' for consistency with the related setting label.
• Improves the redirect links by using add_query_arg().

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

Fixes #66173.

Location:

trunk/src

Files:

• wp-admin/includes/admin-filters.php (modified) (1 diff)
• wp-admin/options-general.php (modified) (3 diffs)
• wp-admin/options.php (modified) (2 diffs)
• wp-admin/user-edit.php (modified) (2 diffs)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/user.php (modified) (2 diffs)

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

@@ -122 +122 @@
 
 add_action( 'admin_notices', 'default_password_nag' );
-add_action( 'admin_notices', 'new_user_email_admin_notice' );
 
 add_action( 'profile_update', 'default_password_nag_edit_user', 10, 2 );

trunk/src/wp-admin/options-general.php

@@ -22 +22 @@
 /* translators: Date and time format for exact current time, mainly about timezones, see https://www.php.net/manual/datetime.format.php */
 $timezone_format = _x( 'Y-m-d H:i:s', 'timezone date format' );
+
+$new_admin_email         = get_option( 'new_admin_email' );
+$pending_new_admin_email = $new_admin_email && get_option( 'admin_email' ) !== $new_admin_email;
 
 add_action( 'admin_head', 'options_general_add_js' );
@@ -67 +70 @@
 <div class="wrap">
 <h1><?php echo esc_html( $title ); ?></h1>
+
+<?php
+if ( isset( $_GET['admin_email_updated'] ) ) {
+        $message = '<strong>' . __( 'Administration email updated.' ) . '</strong>';
+        wp_admin_notice(
+                $message,
+                array(
+                        'id'          => 'message',
+                        'dismissible' => true,
+                        'type'        => 'success',
+                )
+        );
+}
+
+$pending_admin_email_cancel_request_link = sprintf(
+        ' <a href="%1$s">%2$s</a>',
+        esc_url( wp_nonce_url( admin_url( 'options.php?dismiss=new_admin_email' ), 'dismiss-' . get_current_blog_id() . '-new_admin_email' ) ),
+        _x( 'Cancel request', 'admin email change' )
+);
+
+if ( $pending_new_admin_email ) {
+        $message = sprintf(
+                /* translators: %s: New administration email address. */
+                __( 'The administration email address has not been updated yet. Please check the inbox at %s for a confirmation email.' ),
+                '<code>' . esc_html( $new_admin_email ) . '</code>'
+        );
+        $message .= $pending_admin_email_cancel_request_link;
+        wp_admin_notice( $message, array( 'type' => 'info' ) );
+}
+?>
 
 <form method="post" action="options.php" novalidate="novalidate">
@@ -267 +300 @@
 <p class="description" id="new-admin-email-description"><?php _e( 'This address is used for admin purposes. If you change this, an email will be sent to your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ); ?></p>
 <?php
-$new_admin_email = get_option( 'new_admin_email' );
-if ( $new_admin_email && get_option( 'admin_email' ) !== $new_admin_email ) {
+if ( $pending_new_admin_email ) {
         $pending_admin_email_message = sprintf(
-                /* translators: %s: New admin email. */
-                __( 'There is a pending change of the admin email to %s.' ),
+                /* translators: %s: New administration email address. */
+                __( 'There is a pending change of the administration email to %s.' ),
                 '<code>' . esc_html( $new_admin_email ) . '</code>'
         );
-        $pending_admin_email_message .= sprintf(
-                ' <a href="%1$s">%2$s</a>',
-                esc_url( wp_nonce_url( admin_url( 'options.php?dismiss=new_admin_email' ), 'dismiss-' . get_current_blog_id() . '-new_admin_email' ) ),
-                __( 'Cancel' )
-        );
+        $pending_admin_email_message .= $pending_admin_email_cancel_request_link;
         wp_admin_notice(
                 $pending_admin_email_message,
                 array(
-                        'additional_classes' => array( 'updated', 'inline' ),
+                        'type'               => 'info',
+                        'additional_classes' => array( 'inline' ),
                 )
         );

trunk/src/wp-admin/options.php

@@ -58 +58 @@
 if ( ! empty( $_GET['adminhash'] ) ) {
         $new_admin_details = get_option( 'adminhash' );
-        $redirect          = 'options-general.php?updated=false';
+        $redirect          = add_query_arg( array( 'updated' => 'false' ), 'options-general.php' );
 
         if ( is_array( $new_admin_details )
@@ -67 +67 @@
                 delete_option( 'adminhash' );
                 delete_option( 'new_admin_email' );
-                $redirect = 'options-general.php?updated=true';
+                $redirect = add_query_arg(
+                        array(
+                                'updated'             => 'true',
+                                'admin_email_updated' => 'true',
+                        ),
+                        'options-general.php',
+                );
         }
 

trunk/src/wp-admin/user-edit.php

@@ -267 +267 @@
                 <div class="wrap" id="profile-page">
                         <h1 class="wp-heading-inline">
-                                        <?php echo esc_html( $title ); ?>
+                                <?php echo esc_html( $title ); ?>
                         </h1>
+
+                        <?php
+                        if ( IS_PROFILE_PAGE ) {
+                                new_user_email_admin_notice();
+                        }
+                        ?>
 
                         <?php if ( ! IS_PROFILE_PAGE ) : ?>
@@ -597 +603 @@
                                                                         ' <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' ) ),
-                                                                        __( 'Cancel' )
+                                                                        _x( 'Cancel request', 'user email change' )
                                                                 );
                                                                 wp_admin_notice(
                                                                         $pending_change_message,
                                                                         array(
-                                                                                'additional_classes' => array( 'updated', 'inline' ),
+                                                                                'type' => 'info',
+                                                                                'additional_classes' => array( 'inline' ),
                                                                         )
                                                                 );

trunk/src/wp-includes/functions.php

@@ -1267 +1267 @@
                 'activated',
                 'admin_email_remind_later',
+                'admin_email_updated',
                 'approved',
                 'core-major-auto-updates-saved',

trunk/src/wp-includes/user.php

@@ -4018 +4018 @@
         global $pagenow;
 
-        if ( 'profile.php' === $pagenow && isset( $_GET['updated'] ) ) {
-                $email = get_user_meta( get_current_user_id(), '_new_email', true );
+        if ( 'profile.php' === $pagenow ) {
+                $current_user_id = get_current_user_id();
+                $email           = get_user_meta( $current_user_id, '_new_email', true );
                 if ( $email ) {
                         $message = sprintf(
@@ -4025 +4026 @@
                                 __( 'Your email address has not been updated yet. Please check your inbox at %s for a confirmation email.' ),
                                 '<code>' . esc_html( $email['newemail'] ) . '</code>'
+                        );
+                        $message .= sprintf(
+                                ' <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' ),
                         );
                         wp_admin_notice( $message, array( 'type' => 'info' ) );