diff --git a/src/wp-admin/async-upload.php b/src/wp-admin/async-upload.php index 5fbdd370c5c1a..2aeea30bdc58a 100644 --- a/src/wp-admin/async-upload.php +++ b/src/wp-admin/async-upload.php @@ -134,7 +134,8 @@ $message, array( 'id' => $error_description_id, - 'additional_classes' => array( 'error-div', 'error' ), + 'type' => 'error', + 'additional_classes' => array( 'error-div' ), 'paragraph_wrap' => false, ) ); diff --git a/src/wp-admin/edit-comments.php b/src/wp-admin/edit-comments.php index 46cf66d393985..b486a363e128a 100644 --- a/src/wp-admin/edit-comments.php +++ b/src/wp-admin/edit-comments.php @@ -304,8 +304,8 @@ wp_admin_notice( $error_msg, array( - 'id' => 'moderated', - 'additional_classes' => array( 'error' ), + 'id' => 'moderated', + 'type' => 'error', ) ); } @@ -420,9 +420,9 @@ wp_admin_notice( implode( "
\n", $messages ), array( - 'id' => 'moderated', - 'additional_classes' => array( 'updated' ), - 'dismissible' => true, + 'id' => 'moderated', + 'type' => 'success', + 'dismissible' => true, ) ); } diff --git a/src/wp-admin/edit-form-advanced.php b/src/wp-admin/edit-form-advanced.php index 8c80b94c04ffc..5d7eb6c89d9b5 100644 --- a/src/wp-admin/edit-form-advanced.php +++ b/src/wp-admin/edit-form-advanced.php @@ -448,10 +448,9 @@ wp_admin_notice( $message, array( - 'type' => 'success', - 'dismissible' => true, - 'id' => 'message', - 'additional_classes' => array( 'updated' ), + 'type' => 'success', + 'dismissible' => true, + 'id' => 'message', ) ); endif; @@ -466,7 +465,8 @@ $connection_lost_message, array( 'id' => 'lost-connection-notice', - 'additional_classes' => array( 'error', 'hidden' ), + 'type' => 'error', + 'additional_classes' => array( 'hidden' ), ) ); ?> diff --git a/src/wp-admin/edit-link-form.php b/src/wp-admin/edit-link-form.php index 33e14da3fda4f..c72ccaffa70ee 100644 --- a/src/wp-admin/edit-link-form.php +++ b/src/wp-admin/edit-link-form.php @@ -96,9 +96,9 @@ wp_admin_notice( __( 'Link added.' ), array( - 'id' => 'message', - 'additional_classes' => array( 'updated' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'success', + 'dismissible' => true, ) ); } diff --git a/src/wp-admin/edit-tags.php b/src/wp-admin/edit-tags.php index 6efdeb9b0527d..e52835b15a66a 100644 --- a/src/wp-admin/edit-tags.php +++ b/src/wp-admin/edit-tags.php @@ -350,15 +350,15 @@
'message', - 'additional_classes' => array( $class ), - 'dismissible' => true, + 'type' => $type, + 'id' => 'message', + 'dismissible' => true, ) ); diff --git a/src/wp-admin/edit.php b/src/wp-admin/edit.php index 15cb17d303bd3..1c500c9a5ce53 100644 --- a/src/wp-admin/edit.php +++ b/src/wp-admin/edit.php @@ -472,9 +472,9 @@ wp_admin_notice( implode( ' ', $messages ), array( - 'id' => 'message', - 'additional_classes' => array( 'updated' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'success', + 'dismissible' => true, ) ); } diff --git a/src/wp-admin/import.php b/src/wp-admin/import.php index ce17a70f20cf3..9f0147987a962 100644 --- a/src/wp-admin/import.php +++ b/src/wp-admin/import.php @@ -70,7 +70,7 @@ wp_admin_notice( $importer_not_installed, array( - 'additional_classes' => array( 'error' ), + 'type' => 'error', ) ); endif; diff --git a/src/wp-admin/includes/class-bulk-upgrader-skin.php b/src/wp-admin/includes/class-bulk-upgrader-skin.php index f406d160e4a57..835e957bde1ec 100644 --- a/src/wp-admin/includes/class-bulk-upgrader-skin.php +++ b/src/wp-admin/includes/class-bulk-upgrader-skin.php @@ -196,7 +196,7 @@ public function after( $title = '' ) { wp_admin_notice( $after_error_message, array( - 'additional_classes' => array( 'error' ), + 'type' => 'error', ) ); diff --git a/src/wp-admin/includes/class-custom-background.php b/src/wp-admin/includes/class-custom-background.php index 7f8f23485086a..75fc611466e5e 100644 --- a/src/wp-admin/includes/class-custom-background.php +++ b/src/wp-admin/includes/class-custom-background.php @@ -267,8 +267,8 @@ public function admin_page() { wp_admin_notice( $updated_message, array( - 'id' => 'message', - 'additional_classes' => array( 'updated' ), + 'id' => 'message', + 'type' => 'success', ) ); } diff --git a/src/wp-admin/includes/class-custom-image-header.php b/src/wp-admin/includes/class-custom-image-header.php index 97a1a16052d12..a035f6dac63b9 100644 --- a/src/wp-admin/includes/class-custom-image-header.php +++ b/src/wp-admin/includes/class-custom-image-header.php @@ -536,8 +536,8 @@ public function step_1() { wp_admin_notice( $updated_message, array( - 'id' => 'message', - 'additional_classes' => array( 'updated' ), + 'id' => 'message', + 'type' => 'success', ) ); } diff --git a/src/wp-admin/includes/class-wp-plugin-install-list-table.php b/src/wp-admin/includes/class-wp-plugin-install-list-table.php index 7c54aefca1310..7f1220e32ff38 100644 --- a/src/wp-admin/includes/class-wp-plugin-install-list-table.php +++ b/src/wp-admin/includes/class-wp-plugin-install-list-table.php @@ -295,7 +295,8 @@ public function no_items() { wp_admin_notice( $error_message, array( - 'additional_classes' => array( 'inline', 'error' ), + 'type' => 'error', + 'additional_classes' => array( 'inline' ), 'paragraph_wrap' => false, ) ); diff --git a/src/wp-admin/includes/file.php b/src/wp-admin/includes/file.php index d7c771444ac98..6028c8463ce69 100644 --- a/src/wp-admin/includes/file.php +++ b/src/wp-admin/includes/file.php @@ -2520,8 +2520,8 @@ function request_filesystem_credentials( $form_post, $type = '', $error = false, wp_admin_notice( $error_string, array( - 'id' => 'message', - 'additional_classes' => array( 'error' ), + 'id' => 'message', + 'type' => 'error', ) ); } diff --git a/src/wp-admin/includes/nav-menu.php b/src/wp-admin/includes/nav-menu.php index 70263a2034807..3188df43bf37b 100644 --- a/src/wp-admin/includes/nav-menu.php +++ b/src/wp-admin/includes/nav-menu.php @@ -1460,8 +1460,8 @@ function wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selecte $messages[] = wp_get_admin_notice( $menu_item_db_id->get_error_message(), array( - 'id' => 'message', - 'additional_classes' => array( 'error' ), + 'id' => 'message', + 'type' => 'error', ) ); } else { @@ -1514,9 +1514,9 @@ function wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selecte /* translators: %s: Nav menu title. */ $message = sprintf( __( '%s has been updated.' ), '' . $nav_menu_selected_title . '' ); $notice_args = array( - 'id' => 'message', - 'dismissible' => true, - 'additional_classes' => array( 'updated' ), + 'id' => 'message', + 'dismissible' => true, + 'type' => 'success', ); $messages[] = wp_get_admin_notice( $message, $notice_args ); diff --git a/src/wp-admin/includes/network.php b/src/wp-admin/includes/network.php index 15c58c65a3148..fe1503b0e2f95 100644 --- a/src/wp-admin/includes/network.php +++ b/src/wp-admin/includes/network.php @@ -124,7 +124,7 @@ function network_step1( $errors = false ) { wp_admin_notice( $cannot_define_constant_message, array( - 'additional_classes' => array( 'error' ), + 'type' => 'error', ) ); @@ -165,8 +165,8 @@ function network_step1( $errors = false ) { wp_admin_notice( $network_created_error_message, array( - 'additional_classes' => array( 'error' ), - 'paragraph_wrap' => false, + 'type' => 'error', + 'paragraph_wrap' => false, ) ); $error_codes = $errors->get_error_codes(); @@ -198,11 +198,11 @@ function network_step1( $errors = false ) { } else { $subdomain_install = false; $got_mod_rewrite = got_mod_rewrite(); - $message_class = ''; + $message_type = ''; $message = ''; if ( $got_mod_rewrite ) { // Dangerous assumptions. - $message_class = 'updated'; + $message_type = 'success'; $message = '

' . __( 'Warning:' ) . ' '; $message .= '

' . sprintf( /* translators: %s: mod_rewrite */ @@ -210,7 +210,7 @@ function network_step1( $errors = false ) { 'mod_rewrite' ) . '

'; } elseif ( $is_apache ) { - $message_class = 'error'; + $message_type = 'error'; $message = '

' . __( 'Warning:' ) . ' '; $message .= sprintf( /* translators: %s: mod_rewrite */ @@ -231,7 +231,8 @@ function network_step1( $errors = false ) { wp_admin_notice( $message, array( - 'additional_classes' => array( $message_class, 'inline' ), + 'type' => $message_type, + 'additional_classes' => array( 'inline' ), 'paragraph_wrap' => false, ) ); @@ -281,7 +282,8 @@ function network_step1( $errors = false ) { wp_admin_notice( $subdirectory_warning_message, array( - 'additional_classes' => array( 'error', 'inline' ), + 'type' => 'error', + 'additional_classes' => array( 'inline' ), ) ); } @@ -432,7 +434,7 @@ function network_step2( $errors = false ) { wp_admin_notice( $errors->get_error_message(), array( - 'additional_classes' => array( 'error' ), + 'type' => 'error', ) ); } @@ -455,7 +457,7 @@ function network_step2( $errors = false ) { wp_admin_notice( '' . __( 'Warning:' ) . ' ' . __( 'An existing WordPress network was detected.' ), array( - 'additional_classes' => array( 'error' ), + 'type' => 'error', ) ); ?> diff --git a/src/wp-admin/includes/template.php b/src/wp-admin/includes/template.php index bafd5f0904769..654ca2b3264cc 100644 --- a/src/wp-admin/includes/template.php +++ b/src/wp-admin/includes/template.php @@ -1020,8 +1020,8 @@ function wp_import_upload_form( $action ) { wp_admin_notice( $upload_directory_error, array( - 'additional_classes' => array( 'error' ), - 'paragraph_wrap' => false, + 'type' => 'error', + 'paragraph_wrap' => false, ) ); else : @@ -1444,7 +1444,8 @@ function do_meta_boxes( $screen, $context, $data_object ) { wp_admin_notice( $meta_box_not_compatible_message, array( - 'additional_classes' => array( 'error', 'inline' ), + 'type' => 'error', + 'additional_classes' => array( 'inline' ), ) ); } diff --git a/src/wp-admin/includes/user.php b/src/wp-admin/includes/user.php index df91be7e4b98e..a3f473874c5e5 100644 --- a/src/wp-admin/includes/user.php +++ b/src/wp-admin/includes/user.php @@ -556,7 +556,8 @@ function default_password_nag() { wp_admin_notice( $default_password_nag_message, array( - 'additional_classes' => array( 'error', 'default-password-nag' ), + 'type' => 'error', + 'additional_classes' => array( 'default-password-nag' ), 'paragraph_wrap' => false, ) ); diff --git a/src/wp-admin/link-manager.php b/src/wp-admin/link-manager.php index 2748bf8a2a56c..40cf41a7fd35d 100644 --- a/src/wp-admin/link-manager.php +++ b/src/wp-admin/link-manager.php @@ -125,9 +125,9 @@ wp_admin_notice( $deleted_message, array( - 'id' => 'message', - 'additional_classes' => array( 'updated' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'success', + 'dismissible' => true, ) ); $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'deleted' ), $_SERVER['REQUEST_URI'] ); diff --git a/src/wp-admin/nav-menus.php b/src/wp-admin/nav-menus.php index 9998852d06d82..60743d30cec52 100644 --- a/src/wp-admin/nav-menus.php +++ b/src/wp-admin/nav-menus.php @@ -284,9 +284,9 @@ $messages[] = wp_get_admin_notice( __( 'The menu item has been successfully deleted.' ), array( - 'id' => 'message', - 'additional_classes' => array( 'updated' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'success', + 'dismissible' => true, ) ); } @@ -312,18 +312,18 @@ $messages[] = wp_get_admin_notice( $deletion->get_error_message(), array( - 'id' => 'message', - 'additional_classes' => array( 'error' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'error', + 'dismissible' => true, ) ); } else { $messages[] = wp_get_admin_notice( __( 'The menu has been successfully deleted.' ), array( - 'id' => 'message', - 'additional_classes' => array( 'updated' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'success', + 'dismissible' => true, ) ); } @@ -344,9 +344,9 @@ $messages[] = wp_get_admin_notice( $deletion->get_error_message(), array( - 'id' => 'message', - 'additional_classes' => array( 'error' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'error', + 'dismissible' => true, ) ); $deletion_error = true; @@ -357,9 +357,9 @@ $messages[] = wp_get_admin_notice( __( 'Selected menus have been successfully deleted.' ), array( - 'id' => 'message', - 'additional_classes' => array( 'updated' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'success', + 'dismissible' => true, ) ); } @@ -387,9 +387,9 @@ $messages[] = wp_get_admin_notice( $_nav_menu_selected_id->get_error_message(), array( - 'id' => 'message', - 'additional_classes' => array( 'error' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'error', + 'dismissible' => true, ) ); } else { @@ -445,9 +445,9 @@ $messages[] = wp_get_admin_notice( __( 'Please enter a valid menu name.' ), array( - 'id' => 'message', - 'additional_classes' => array( 'error' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'error', + 'dismissible' => true, ) ); } @@ -474,9 +474,9 @@ $messages[] = wp_get_admin_notice( __( 'Please enter a valid menu name.' ), array( - 'id' => 'message', - 'additional_classes' => array( 'error' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'error', + 'dismissible' => true, ) ); $menu_title = $_menu_object->name; @@ -490,9 +490,9 @@ $messages[] = wp_get_admin_notice( $_nav_menu_selected_id->get_error_message(), array( - 'id' => 'message', - 'additional_classes' => array( 'error' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'error', + 'dismissible' => true, ) ); } else { @@ -534,9 +534,9 @@ $messages[] = wp_get_admin_notice( __( 'Menu locations updated.' ), array( - 'id' => 'message', - 'additional_classes' => array( 'updated' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'success', + 'dismissible' => true, ) ); } @@ -700,9 +700,9 @@ function wp_nav_menu_max_depth( $classes ) { $messages[] = wp_get_admin_notice( $message_no_theme_support, array( - 'id' => 'message', - 'additional_classes' => array( 'updated' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'success', + 'dismissible' => true, ) ); } diff --git a/src/wp-admin/network/themes.php b/src/wp-admin/network/themes.php index 763a13712a59b..f556e4125ba13 100644 --- a/src/wp-admin/network/themes.php +++ b/src/wp-admin/network/themes.php @@ -139,7 +139,7 @@ wp_admin_notice( '' . __( 'Caution:' ) . ' ' . __( 'This theme may be active on other sites in the network.' ), array( - 'additional_classes' => array( 'error' ), + 'type' => 'error', ) ); ?> @@ -150,7 +150,7 @@ wp_admin_notice( '' . __( 'Caution:' ) . ' ' . __( 'These themes may be active on other sites in the network.' ), array( - 'additional_classes' => array( 'error' ), + 'type' => 'error', ) ); ?> diff --git a/src/wp-admin/options-general.php b/src/wp-admin/options-general.php index 6a9a6d2f3812d..b69a2f15179e7 100644 --- a/src/wp-admin/options-general.php +++ b/src/wp-admin/options-general.php @@ -281,7 +281,8 @@ class="" wp_admin_notice( $pending_admin_email_message, array( - 'additional_classes' => array( 'updated', 'inline' ), + 'type' => 'success', + 'additional_classes' => array( 'inline' ), ) ); } diff --git a/src/wp-admin/plugin-editor.php b/src/wp-admin/plugin-editor.php index 4beee7b8409da..9c6e446e9c354 100644 --- a/src/wp-admin/plugin-editor.php +++ b/src/wp-admin/plugin-editor.php @@ -33,8 +33,8 @@ wp_admin_notice( __( 'No plugins are currently available.' ), array( - 'id' => 'message', - 'additional_classes' => array( 'error' ), + 'id' => 'message', + 'type' => 'error', ) ); ?> @@ -201,8 +201,9 @@ wp_admin_notice( __( 'File edited successfully.' ), array( - 'additional_classes' => array( 'updated', 'is-dismissible' ), - 'id' => 'message', + 'type' => 'success', + 'id' => 'message', + 'dismissible' => true, ) ); elseif ( is_wp_error( $edit_error ) ) : diff --git a/src/wp-admin/plugins.php b/src/wp-admin/plugins.php index 6a359c822fac1..2bd4b25cf810d 100644 --- a/src/wp-admin/plugins.php +++ b/src/wp-admin/plugins.php @@ -347,7 +347,7 @@ wp_admin_notice( $maybe_active_plugin, array( - 'additional_classes' => array( 'error' ), + 'type' => 'error', ) ); endif; @@ -361,7 +361,7 @@ wp_admin_notice( $maybe_active_plugins, array( - 'additional_classes' => array( 'error' ), + 'type' => 'error', ) ); endif; @@ -648,18 +648,18 @@ wp_admin_notice( $deactivated_message, array( - 'id' => 'message', - 'additional_classes' => array( 'error' ), + 'id' => 'message', + 'type' => 'error', ) ); } } -// Used by wp_admin_notice() updated notices. +// Used by wp_admin_notice() success notices. $updated_notice_args = array( - 'id' => 'message', - 'additional_classes' => array( 'updated' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'success', + 'dismissible' => true, ); if ( isset( $_GET['error'] ) ) { @@ -700,8 +700,8 @@ wp_admin_notice( $errmsg, array( - 'id' => 'message', - 'additional_classes' => array( 'error' ), + 'id' => 'message', + 'type' => 'error', ) ); @@ -719,9 +719,9 @@ wp_admin_notice( $plugin_not_deleted_message, array( - 'id' => 'message', - 'additional_classes' => array( 'error' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'error', + 'dismissible' => true, ) ); } else { diff --git a/src/wp-admin/theme-editor.php b/src/wp-admin/theme-editor.php index 68d6f9a7e966a..b7cc694fa5566 100644 --- a/src/wp-admin/theme-editor.php +++ b/src/wp-admin/theme-editor.php @@ -194,9 +194,9 @@ wp_admin_notice( __( 'File edited successfully.' ), array( - 'id' => 'message', - 'dismissible' => true, - 'additional_classes' => array( 'updated' ), + 'id' => 'message', + 'dismissible' => true, + 'type' => 'success', ) ); } elseif ( is_wp_error( $edit_error ) ) { @@ -313,7 +313,7 @@ wp_admin_notice( '' . __( 'This theme is broken.' ) . ' ' . $theme->errors()->get_error_message(), array( - 'additional_classes' => array( 'error' ), + 'type' => 'error', ) ); } @@ -350,7 +350,7 @@ wp_admin_notice( __( 'File does not exist! Please double check the name and try again.' ), array( - 'additional_classes' => array( 'error' ), + 'type' => 'error', ) ); else : diff --git a/src/wp-admin/theme-install.php b/src/wp-admin/theme-install.php index fc24334abff85..1876d0110749a 100644 --- a/src/wp-admin/theme-install.php +++ b/src/wp-admin/theme-install.php @@ -186,7 +186,8 @@ wp_admin_notice( __( 'The Theme Installer screen requires JavaScript.' ), array( - 'additional_classes' => array( 'error', 'hide-if-js' ), + 'type' => 'error', + 'additional_classes' => array( 'hide-if-js' ), ) ); ?> diff --git a/src/wp-admin/themes.php b/src/wp-admin/themes.php index a9f24765ce742..393d4157e309b 100644 --- a/src/wp-admin/themes.php +++ b/src/wp-admin/themes.php @@ -262,9 +262,9 @@ wp_admin_notice( __( 'The active theme is broken. Reverting to the default theme.' ), array( - 'id' => 'message1', - 'additional_classes' => array( 'updated' ), - 'dismissible' => true, + 'id' => 'message1', + 'type' => 'success', + 'dismissible' => true, ) ); } elseif ( isset( $_GET['activated'] ) ) { @@ -272,18 +272,18 @@ wp_admin_notice( __( 'Settings saved and theme activated.' ) . ' ' . __( 'Visit site' ) . '', array( - 'id' => 'message2', - 'additional_classes' => array( 'updated' ), - 'dismissible' => true, + 'id' => 'message2', + 'type' => 'success', + 'dismissible' => true, ) ); } else { wp_admin_notice( __( 'New theme activated.' ) . ' ' . __( 'Visit site' ) . '', array( - 'id' => 'message2', - 'additional_classes' => array( 'updated' ), - 'dismissible' => true, + 'id' => 'message2', + 'type' => 'success', + 'dismissible' => true, ) ); } @@ -291,52 +291,52 @@ wp_admin_notice( __( 'Theme deleted.' ), array( - 'id' => 'message3', - 'additional_classes' => array( 'updated' ), - 'dismissible' => true, + 'id' => 'message3', + 'type' => 'success', + 'dismissible' => true, ) ); } elseif ( isset( $_GET['delete-active-child'] ) ) { wp_admin_notice( __( 'You cannot delete a theme while it has an active child theme.' ), array( - 'id' => 'message4', - 'additional_classes' => array( 'error' ), + 'id' => 'message4', + 'type' => 'error', ) ); } elseif ( isset( $_GET['resumed'] ) ) { wp_admin_notice( __( 'Theme resumed.' ), array( - 'id' => 'message5', - 'additional_classes' => array( 'updated' ), - 'dismissible' => true, + 'id' => 'message5', + 'type' => 'success', + 'dismissible' => true, ) ); } elseif ( isset( $_GET['error'] ) && 'resuming' === $_GET['error'] ) { wp_admin_notice( __( 'Theme could not be resumed because it triggered a fatal error.' ), array( - 'id' => 'message6', - 'additional_classes' => array( 'error' ), + 'id' => 'message6', + 'type' => 'error', ) ); } elseif ( isset( $_GET['enabled-auto-update'] ) ) { wp_admin_notice( __( 'Theme will be auto-updated.' ), array( - 'id' => 'message7', - 'additional_classes' => array( 'updated' ), - 'dismissible' => true, + 'id' => 'message7', + 'type' => 'success', + 'dismissible' => true, ) ); } elseif ( isset( $_GET['disabled-auto-update'] ) ) { wp_admin_notice( __( 'Theme will no longer be auto-updated.' ), array( - 'id' => 'message8', - 'additional_classes' => array( 'updated' ), - 'dismissible' => true, + 'id' => 'message8', + 'type' => 'success', + 'dismissible' => true, ) ); } @@ -347,7 +347,7 @@ wp_admin_notice( '' . __( 'Error:' ) . ' ' . $current_theme->errors()->get_error_message(), array( - 'additional_classes' => array( 'error' ), + 'type' => 'error', ) ); } diff --git a/src/wp-admin/update-core.php b/src/wp-admin/update-core.php index f1cd0c0a66132..c2898499f4fb0 100644 --- a/src/wp-admin/update-core.php +++ b/src/wp-admin/update-core.php @@ -1075,7 +1075,7 @@ function do_undismiss_core_update() { wp_admin_notice( __( 'Please select one or more themes to update.' ), array( - 'additional_classes' => array( 'error' ), + 'type' => 'error', ) ); } @@ -1085,7 +1085,7 @@ function do_undismiss_core_update() { wp_admin_notice( __( 'Please select one or more plugins to update.' ), array( - 'additional_classes' => array( 'error' ), + 'type' => 'error', ) ); } diff --git a/src/wp-admin/upload.php b/src/wp-admin/upload.php index 1f42a287e4957..5f3b43093128a 100644 --- a/src/wp-admin/upload.php +++ b/src/wp-admin/upload.php @@ -225,9 +225,9 @@ function () { wp_admin_notice( $message, array( - 'id' => 'message', - 'additional_classes' => array( 'updated' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'success', + 'dismissible' => true, ) ); } @@ -240,7 +240,8 @@ function () { wp_admin_notice( $js_required_message, array( - 'additional_classes' => array( 'error', 'hide-if-js' ), + 'type' => 'error', + 'additional_classes' => array( 'hide-if-js' ), ) ); ?> @@ -442,9 +443,9 @@ function () { wp_admin_notice( $message, array( - 'id' => 'message', - 'additional_classes' => array( 'updated' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'success', + 'dismissible' => true, ) ); } diff --git a/src/wp-admin/user-edit.php b/src/wp-admin/user-edit.php index 5d45c63801bfe..c8a8936fd2424 100644 --- a/src/wp-admin/user-edit.php +++ b/src/wp-admin/user-edit.php @@ -228,10 +228,10 @@ wp_admin_notice( $message, array( - 'id' => 'message', - 'dismissible' => true, - 'additional_classes' => array( 'updated' ), - 'paragraph_wrap' => false, + 'id' => 'message', + 'dismissible' => true, + 'type' => 'success', + 'paragraph_wrap' => false, ) ); endif; @@ -253,7 +253,7 @@ wp_admin_notice( implode( "

\n

", $errors->get_error_messages() ), array( - 'additional_classes' => array( 'error' ), + 'type' => 'error', ) ); } @@ -596,7 +596,8 @@ wp_admin_notice( $pending_change_message, array( - 'additional_classes' => array( 'updated', 'inline' ), + 'type' => 'success', + 'additional_classes' => array( 'inline' ), ) ); endif; diff --git a/src/wp-admin/user-new.php b/src/wp-admin/user-new.php index ba027b06bb366..70643976659b3 100644 --- a/src/wp-admin/user-new.php +++ b/src/wp-admin/user-new.php @@ -404,8 +404,8 @@ wp_admin_notice( '

', array( - 'additional_classes' => array( 'error' ), - 'paragraph_wrap' => false, + 'type' => 'error', + 'paragraph_wrap' => false, ) ); endif; @@ -415,9 +415,9 @@ wp_admin_notice( $msg, array( - 'id' => 'message', - 'additional_classes' => array( 'updated' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'success', + 'dismissible' => true, ) ); } @@ -433,8 +433,8 @@ wp_admin_notice( $error_message, array( - 'additional_classes' => array( 'error' ), - 'paragraph_wrap' => false, + 'type' => 'error', + 'paragraph_wrap' => false, ) ); endif; diff --git a/src/wp-admin/users.php b/src/wp-admin/users.php index a94a9eff4a9cf..8dbe696a6765c 100644 --- a/src/wp-admin/users.php +++ b/src/wp-admin/users.php @@ -325,7 +325,7 @@ wp_admin_notice( '' . __( 'Error:' ) . ' ' . __( 'Please select an option.' ), array( - 'additional_classes' => array( 'error' ), + 'type' => 'error', ) ); endif; @@ -652,9 +652,9 @@ $messages[] = wp_get_admin_notice( $message, array( - 'id' => 'message', - 'additional_classes' => array( 'updated' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'success', + 'dismissible' => true, ) ); break; @@ -678,9 +678,9 @@ $messages[] = wp_get_admin_notice( $message, array( - 'id' => 'message', - 'additional_classes' => array( 'updated' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'success', + 'dismissible' => true, ) ); break; @@ -696,9 +696,9 @@ $messages[] = wp_get_admin_notice( $message, array( - 'id' => 'message', - 'additional_classes' => array( 'updated' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'success', + 'dismissible' => true, ) ); break; @@ -706,9 +706,9 @@ $messages[] = wp_get_admin_notice( __( 'Changed roles.' ), array( - 'id' => 'message', - 'additional_classes' => array( 'updated' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'success', + 'dismissible' => true, ) ); break; @@ -716,18 +716,18 @@ $messages[] = wp_get_admin_notice( __( 'You cannot change your own role to one that does not allow managing other users. Your role was not changed.' ), array( - 'id' => 'message', - 'additional_classes' => array( 'error' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'error', + 'dismissible' => true, ) ); if ( $delete_count > 0 ) { $messages[] = wp_get_admin_notice( __( 'Other user roles have been changed.' ), array( - 'id' => 'message', - 'additional_classes' => array( 'updated' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'success', + 'dismissible' => true, ) ); } @@ -736,18 +736,18 @@ $messages[] = wp_get_admin_notice( __( 'You cannot delete the current user.' ), array( - 'id' => 'message', - 'additional_classes' => array( 'error' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'error', + 'dismissible' => true, ) ); if ( $delete_count > 0 ) { $messages[] = wp_get_admin_notice( __( 'Other users have been deleted.' ), array( - 'id' => 'message', - 'additional_classes' => array( 'updated' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'success', + 'dismissible' => true, ) ); } @@ -756,18 +756,18 @@ $messages[] = wp_get_admin_notice( __( 'Users could not be deleted because no user was selected for content reassignment.' ), array( - 'id' => 'message', - 'additional_classes' => array( 'error' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'error', + 'dismissible' => true, ) ); if ( $delete_count > 0 ) { $messages[] = wp_get_admin_notice( __( 'Other users have been deleted.' ), array( - 'id' => 'message', - 'additional_classes' => array( 'updated' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'success', + 'dismissible' => true, ) ); } @@ -777,7 +777,8 @@ __( 'User removed from this site.' ), array( 'id' => 'message', - 'additional_classes' => array( 'updated', 'fade' ), + 'type' => 'success', + 'additional_classes' => array( 'fade' ), 'dismissible' => true, ) ); @@ -786,16 +787,17 @@ $messages[] = wp_get_admin_notice( __( 'You cannot remove the current user.' ), array( - 'id' => 'message', - 'additional_classes' => array( 'error' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'error', + 'dismissible' => true, ) ); $messages[] = wp_get_admin_notice( __( 'Other users have been removed.' ), array( 'id' => 'message', - 'additional_classes' => array( 'updated', 'fade' ), + 'type' => 'success', + 'additional_classes' => array( 'fade' ), 'dismissible' => true, ) ); @@ -813,7 +815,7 @@ wp_admin_notice( '', array( - 'additional_classes' => array( 'error' ), + 'type' => 'error', ) ); endif; diff --git a/src/wp-admin/widgets-form.php b/src/wp-admin/widgets-form.php index e47905c5d0099..ca9c13a3607c1 100644 --- a/src/wp-admin/widgets-form.php +++ b/src/wp-admin/widgets-form.php @@ -419,9 +419,9 @@ wp_admin_notice( $messages[ $_GET['message'] ], array( - 'id' => 'message', - 'additional_classes' => array( 'updated' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'success', + 'dismissible' => true, ) ); } @@ -429,9 +429,9 @@ wp_admin_notice( $errors[ $_GET['error'] ], array( - 'id' => 'message', - 'additional_classes' => array( 'error' ), - 'dismissible' => true, + 'id' => 'message', + 'type' => 'error', + 'dismissible' => true, ) ); } diff --git a/src/wp-includes/media-template.php b/src/wp-includes/media-template.php index 460cf3b3020e5..70d33eb31fcdd 100644 --- a/src/wp-includes/media-template.php +++ b/src/wp-includes/media-template.php @@ -385,8 +385,8 @@ function wp_print_media_templates() { wp_admin_notice( __( 'The Edit Media screen is deprecated as of WordPress 6.3. Please use the Media Library instead.' ), array( - 'id' => 'message', - 'additional_classes' => array( 'error' ), + 'id' => 'message', + 'type' => 'error', ) ); }