Changeset 56573 for trunk/src/wp-admin/users.php

Timestamp:

09/14/2023 02:13:42 AM (3 years ago)

Author:

joedolson

Message:

Administration: Use wp_admin_notice() for .updated.

Add usages of wp_admin_notice() and wp_get_admin_notice() on .updated in the root level of /wp-admin/. Ongoing task to implement new function across core.

Props costdev, joedolson.
See #57791.

File:

• trunk/src/wp-admin/users.php (modified) (3 diffs)

trunk/src/wp-admin/users.php

@@ -611 +611 @@
                                                 $message = _n( '%s user deleted.', '%s users deleted.', $delete_count );
                                         }
-                                        $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $delete_count ) ) . '</p></div>';
+                                        $message    = sprintf( $message, number_format_i18n( $delete_count ) );
+                                        $messages[] = wp_get_admin_notice(
+                                                $message,
+                                                array(
+                                                        'id'                 => 'message',
+                                                        'additional_classes' => array( 'updated' ),
+                                                        'dismissible'        => true,
+                                                )
+                                        );
                                         break;
                                 case 'add':
                                         $message = __( 'New user created.' );
-
                                         $user_id = isset( $_GET['id'] ) ? $_GET['id'] : false;
                                         if ( $user_id && current_user_can( 'edit_user', $user_id ) ) {
@@ -631 +638 @@
                                         }
 
-                                        $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . $message . '</p></div>';
+                                        $messages[] = wp_get_admin_notice(
+                                                $message,
+                                                array(
+                                                        'id'                 => 'message',
+                                                        'additional_classes' => array( 'updated' ),
+                                                        'dismissible'        => true,
+                                                )
+                                        );
                                         break;
                                 case 'resetpassword':
@@ -641 +655 @@
                                                 $message = _n( 'Password reset links sent to %s user.', 'Password reset links sent to %s users.', $reset_count );
                                         }
-                                        $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $reset_count ) ) . '</p></div>';
+                                        $message    = sprintf( $message, number_format_i18n( $reset_count ) );
+                                        $messages[] = wp_get_admin_notice(
+                                                $message,
+                                                array(
+                                                        'id'                 => 'message',
+                                                        'additional_classes' => array( 'updated' ),
+                                                        'dismissible'        => true,
+                                                )
+                                        );
                                         break;
                                 case 'promote':
-                                        $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Changed roles.' ) . '</p></div>';
+                                        $messages[] = wp_get_admin_notice(
+                                                __( 'Changed roles.' ),
+                                                array(
+                                                        'id'                 => 'message',
+                                                        'additional_classes' => array( 'updated' ),
+                                                        'dismissible'        => true,
+                                                )
+                                        );
                                         break;
                                 case 'err_admin_role':
-                                        $messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __( 'The current user&#8217;s role must have user editing capabilities.' ) . '</p></div>';
-                                        $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Other user roles have been changed.' ) . '</p></div>';
+                                        $messages[] = wp_get_admin_notice(
+                                                __( 'The current user&#8217;s role must have user editing capabilities.' ),
+                                                array(
+                                                        'id'                 => 'message',
+                                                        'additional_classes' => array( 'error' ),
+                                                        'dismissible'        => true,
+                                                )
+                                        );
+                                        $messages[] = wp_get_admin_notice(
+                                                __( 'Other user roles have been changed.' ),
+                                                array(
+                                                        'id'                 => 'message',
+                                                        'additional_classes' => array( 'updated' ),
+                                                        'dismissible'        => true,
+                                                )
+                                        );
                                         break;
                                 case 'err_admin_del':
-                                        $messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __( 'You cannot delete the current user.' ) . '</p></div>';
-                                        $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Other users have been deleted.' ) . '</p></div>';
+                                        $messages[] = wp_get_admin_notice(
+                                                __( 'You cannot delete the current user.' ),
+                                                array(
+                                                        'id'                 => 'message',
+                                                        'additional_classes' => array( 'error' ),
+                                                        'dismissible'        => true,
+                                                )
+                                        );
+                                        $messages[] = wp_get_admin_notice(
+                                                __( 'Other users have been deleted.' ),
+                                                array(
+                                                        'id'                 => 'message',
+                                                        'additional_classes' => array( 'updated' ),
+                                                        'dismissible'        => true,
+                                                )
+                                        );
                                         break;
                                 case 'remove':
-                                        $messages[] = '<div id="message" class="updated notice is-dismissible fade"><p>' . __( 'User removed from this site.' ) . '</p></div>';
+                                        $messages[] = wp_get_admin_notice(
+                                                __( 'User removed from this site.' ),
+                                                array(
+                                                        'id'                 => 'message',
+                                                        'additional_classes' => array( 'updated', 'fade' ),
+                                                        'dismissible'        => true,
+                                                )
+                                        );
                                         break;
                                 case 'err_admin_remove':
-                                        $messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __( 'You cannot remove the current user.' ) . '</p></div>';
-                                        $messages[] = '<div id="message" class="updated notice is-dismissible fade"><p>' . __( 'Other users have been removed.' ) . '</p></div>';
+                                        $messages[] = wp_get_admin_notice(
+                                                __( 'You cannot remove the current user.' ),
+                                                array(
+                                                        'id'                 => 'message',
+                                                        'additional_classes' => array( 'error' ),
+                                                        'dismissible'        => true,
+                                                )
+                                        );
+                                        $messages[] = wp_get_admin_notice(
+                                                __( 'Other users have been removed.' ),
+                                                array(
+                                                        'id'                 => 'message',
+                                                        'additional_classes' => array( 'updated', 'fade' ),
+                                                        'dismissible'        => true,
+                                                )
+                                        );
                                         break;
                         }