diff --git a/wp-admin/includes/class-wp-ms-themes-list-table.php b/wp-admin/includes/class-wp-ms-themes-list-table.php
index 6dfe3fe71d..4b94e53921 100644
--- a/wp-admin/includes/class-wp-ms-themes-list-table.php
+++ b/wp-admin/includes/class-wp-ms-themes-list-table.php
@@ -859,7 +859,13 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
*/
echo apply_filters( 'theme_auto_update_setting_html', $html, $stylesheet, $theme );
- echo '
';
+ wp_admin_notice(
+ '',
+ array(
+ 'type' => 'error',
+ 'additional_classes' => array( 'notice-alt', 'inline', 'hidden' ),
+ )
+ );
}
/**
diff --git a/wp-admin/includes/network.php b/wp-admin/includes/network.php
index 027297d598..562a733770 100644
--- a/wp-admin/includes/network.php
+++ b/wp-admin/includes/network.php
@@ -125,11 +125,14 @@ function network_step1( $errors = false ) {
$active_plugins = get_option( 'active_plugins' );
if ( ! empty( $active_plugins ) ) {
- echo '' . __( 'Warning:' ) . ' ' . sprintf(
- /* translators: %s: URL to Plugins screen. */
- __( 'Please deactivate your plugins before enabling the Network feature.' ),
- admin_url( 'plugins.php?plugin_status=active' )
- ) . '
';
+ wp_admin_notice(
+ '' . __( 'Warning:' ) . ' ' . sprintf(
+ /* translators: %s: URL to Plugins screen. */
+ __( 'Please deactivate your plugins before enabling the Network feature.' ),
+ admin_url( 'plugins.php?plugin_status=active' )
+ ),
+ array( 'type' => 'warning' )
+ );
echo '' . __( 'Once the network is created, you may reactivate your plugins.' ) . '
';
echo '';
require_once ABSPATH . 'wp-admin/admin-footer.php';
@@ -438,35 +441,36 @@ function network_step2( $errors = false ) {
?>
-
' . __( 'Caution:' ) . ' ';
+ $notice_args = array(
+ 'type' => 'warning',
+ 'additional_classes' => 'inline',
+ );
+
if ( file_exists( $home_path . '.htaccess' ) ) {
- echo '' . __( 'Caution:' ) . ' ';
- printf(
+ $notice_message .= sprintf(
/* translators: 1: wp-config.php, 2: .htaccess */
__( 'You should back up your existing %1$s and %2$s files.' ),
'wp-config.php
',
'.htaccess
'
);
} elseif ( file_exists( $home_path . 'web.config' ) ) {
- echo '' . __( 'Caution:' ) . ' ';
- printf(
+ $notice_message .= sprintf(
/* translators: 1: wp-config.php, 2: web.config */
__( 'You should back up your existing %1$s and %2$s files.' ),
'wp-config.php
',
'web.config
'
);
} else {
- echo '' . __( 'Caution:' ) . ' ';
- printf(
+ $notice_message .= sprintf(
/* translators: %s: wp-config.php */
__( 'You should back up your existing %s file.' ),
'wp-config.php
'
);
}
- ?>
-
-
diff --git a/wp-admin/my-sites.php b/wp-admin/my-sites.php
index e395579ea2..51dc1bdd26 100644
--- a/wp-admin/my-sites.php
+++ b/wp-admin/my-sites.php
@@ -55,9 +55,17 @@ get_current_screen()->set_help_sidebar(
require_once ABSPATH . 'wp-admin/admin-header.php';
-if ( $updated ) { ?>
-
-
+if ( $updated ) {
+ wp_admin_notice(
+ '' . __( 'Settings saved.' ) . '',
+ array(
+ 'type' => 'success',
+ 'dismissible' => true,
+ 'id' => 'message',
+ )
+ );
+}
+?>
@@ -74,8 +82,14 @@ if ( in_array( get_site_option( 'registration' ), array( 'all', 'blog' ), true )
}
if ( empty( $blogs ) ) :
+ wp_admin_notice(
+ '' . __( 'You must be a member of at least one site to use this page.' ) . '',
+ array(
+ 'type' => 'error',
+ 'dismissible' => true,
+ )
+ );
?>
-
diff --git a/wp-admin/network/settings.php b/wp-admin/network/settings.php
index 6df68c6020..7dff74d4ad 100644
--- a/wp-admin/network/settings.php
+++ b/wp-admin/network/settings.php
@@ -138,9 +138,14 @@ if ( $_POST ) {
require_once ABSPATH . 'wp-admin/admin-header.php';
if ( isset( $_GET['updated'] ) ) {
- ?>
-
- 'success',
+ 'dismissible' => true,
+ 'id' => 'message',
+ )
+ );
}
?>
@@ -167,24 +172,28 @@ if ( isset( $_GET['updated'] ) ) {
-
-
- ' . esc_html( $new_admin_email ) . ''
- );
- printf(
- ' %2$s',
- esc_url( wp_nonce_url( network_admin_url( 'settings.php?dismiss=new_network_admin_email' ), 'dismiss_new_network_admin_email' ) ),
- __( 'Cancel' )
- );
- ?>
-
-
-
+ $notice_message = sprintf(
+ /* translators: %s: New network admin email. */
+ __( 'There is a pending change of the network admin email to %s.' ),
+ '' . esc_html( $new_admin_email ) . '
'
+ );
+
+ $notice_message .= sprintf(
+ ' %2$s',
+ esc_url( wp_nonce_url( network_admin_url( 'settings.php?dismiss=new_network_admin_email' ), 'dismiss_new_network_admin_email' ) ),
+ __( 'Cancel' )
+ );
+
+ wp_admin_notice(
+ $notice_message,
+ array(
+ 'type' => 'warning',
+ 'dismissible' => true,
+ 'additional_classes' => array( 'inline' ),
+ )
+ );
+ endif;
+ ?>
diff --git a/wp-admin/network/site-info.php b/wp-admin/network/site-info.php
index 6030dcd50b..defcc26e44 100644
--- a/wp-admin/network/site-info.php
+++ b/wp-admin/network/site-info.php
@@ -146,8 +146,14 @@ network_edit_site_nav(
);
if ( ! empty( $messages ) ) {
+ $notice_args = array(
+ 'type' => 'success',
+ 'dismissible' => true,
+ 'id' => 'message',
+ );
+
foreach ( $messages as $msg ) {
- echo '';
+ wp_admin_notice( $msg, $notice_args );
}
}
?>
diff --git a/wp-admin/network/site-new.php b/wp-admin/network/site-new.php
index 3d226d3a0b..4bdd559e7d 100644
--- a/wp-admin/network/site-new.php
+++ b/wp-admin/network/site-new.php
@@ -192,8 +192,14 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
'success',
+ 'dismissible' => true,
+ 'id' => 'message',
+ );
+
foreach ( $messages as $msg ) {
- echo '';
+ wp_admin_notice( $msg, $notice_args );
}
}
?>
diff --git a/wp-admin/network/site-settings.php b/wp-admin/network/site-settings.php
index c8cef03466..adfc95cfa9 100644
--- a/wp-admin/network/site-settings.php
+++ b/wp-admin/network/site-settings.php
@@ -104,8 +104,14 @@ network_edit_site_nav(
);
if ( ! empty( $messages ) ) {
+ $notice_args = array(
+ 'type' => 'success',
+ 'dismissible' => true,
+ 'id' => 'message',
+ );
+
foreach ( $messages as $msg ) {
- echo '';
+ wp_admin_notice( $msg, $notice_args );
}
}
?>
diff --git a/wp-admin/network/site-themes.php b/wp-admin/network/site-themes.php
index abca9f9720..79fe4d5f05 100644
--- a/wp-admin/network/site-themes.php
+++ b/wp-admin/network/site-themes.php
@@ -196,7 +196,15 @@ if ( isset( $_GET['enabled'] ) ) {
/* translators: %s: Number of themes. */
$message = _n( '%s theme enabled.', '%s themes enabled.', $enabled );
}
- echo '' . sprintf( $message, number_format_i18n( $enabled ) ) . '
';
+
+ wp_admin_notice(
+ sprintf( $message, number_format_i18n( $enabled ) ),
+ array(
+ 'type' => 'success',
+ 'dismissible' => true,
+ 'id' => 'message',
+ )
+ );
} elseif ( isset( $_GET['disabled'] ) ) {
$disabled = absint( $_GET['disabled'] );
if ( 1 === $disabled ) {
@@ -205,9 +213,24 @@ if ( isset( $_GET['enabled'] ) ) {
/* translators: %s: Number of themes. */
$message = _n( '%s theme disabled.', '%s themes disabled.', $disabled );
}
- echo '' . sprintf( $message, number_format_i18n( $disabled ) ) . '
';
+
+ wp_admin_notice(
+ sprintf( $message, number_format_i18n( $disabled ) ),
+ array(
+ 'type' => 'success',
+ 'dismissible' => true,
+ 'id' => 'message',
+ )
+ );
} elseif ( isset( $_GET['error'] ) && 'none' === $_GET['error'] ) {
- echo '' . __( 'No theme selected.' ) . '
';
+ wp_admin_notice(
+ __( 'No theme selected.' ),
+ array(
+ 'type' => 'error',
+ 'dismissible' => true,
+ 'id' => 'message',
+ )
+ );
}
?>
diff --git a/wp-admin/network/site-users.php b/wp-admin/network/site-users.php
index af153291f3..78af65b9ed 100644
--- a/wp-admin/network/site-users.php
+++ b/wp-admin/network/site-users.php
@@ -234,41 +234,57 @@ network_edit_site_nav(
);
if ( isset( $_GET['update'] ) ) :
+ $message = '';
+ $type = 'error';
+
switch ( $_GET['update'] ) {
case 'adduser':
- echo '' . __( 'User added.' ) . '
';
+ $type = 'success';
+ $message = __( 'User added.' );
break;
case 'err_add_member':
- echo '' . __( 'User is already a member of this site.' ) . '
';
+ $message = __( 'User is already a member of this site.' );
break;
case 'err_add_fail':
- echo '' . __( 'User could not be added to this site.' ) . '
';
+ $message = __( 'User could not be added to this site.' );
break;
case 'err_add_notfound':
- echo '' . __( 'Enter the username of an existing user.' ) . '
';
+ $message = __( 'Enter the username of an existing user.' );
break;
case 'promote':
- echo '' . __( 'Changed roles.' ) . '
';
+ $type = 'success';
+ $message = __( 'Changed roles.' );
break;
case 'err_promote':
- echo '' . __( 'Select a user to change role.' ) . '
';
+ $message = __( 'Select a user to change role.' );
break;
case 'remove':
- echo '' . __( 'User removed from this site.' ) . '
';
+ $type = 'success';
+ $message = __( 'User removed from this site.' );
break;
case 'err_remove':
- echo '' . __( 'Select a user to remove.' ) . '
';
+ $message = __( 'Select a user to remove.' );
break;
case 'newuser':
- echo '' . __( 'User created.' ) . '
';
+ $type = 'success';
+ $message = __( 'User created.' );
break;
case 'err_new':
- echo '' . __( 'Enter the username and email.' ) . '
';
+ $message = __( 'Enter the username and email.' );
break;
case 'err_new_dup':
- echo '' . __( 'Duplicated username or email address.' ) . '
';
+ $message = __( 'Duplicated username or email address.' );
break;
}
+
+ wp_admin_notice(
+ $message,
+ array(
+ 'type' => $type,
+ 'dismissible' => true,
+ 'id' => 'message',
+ )
+ );
endif;
?>
diff --git a/wp-admin/network/sites.php b/wp-admin/network/sites.php
index 21bfab9c42..7ba3ec55ff 100644
--- a/wp-admin/network/sites.php
+++ b/wp-admin/network/sites.php
@@ -358,7 +358,14 @@ if ( isset( $_GET['updated'] ) ) {
}
if ( ! empty( $msg ) ) {
- $msg = '';
+ $msg = wp_get_admin_notice(
+ $msg,
+ array(
+ 'type' => 'success',
+ 'dismissible' => true,
+ 'id' => 'message',
+ )
+ );
}
}
diff --git a/wp-admin/network/themes.php b/wp-admin/network/themes.php
index 1ad21e9738..9e45c331cf 100644
--- a/wp-admin/network/themes.php
+++ b/wp-admin/network/themes.php
@@ -367,57 +367,82 @@ if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
' . sprintf( $message, number_format_i18n( $enabled ) ) . '
';
} elseif ( isset( $_GET['disabled'] ) ) {
$disabled = absint( $_GET['disabled'] );
if ( 1 === $disabled ) {
$message = __( 'Theme disabled.' );
} else {
- /* translators: %s: Number of themes. */
- $message = _n( '%s theme disabled.', '%s themes disabled.', $disabled );
+ $message = sprintf(
+ /* translators: %s: Number of themes. */
+ _n( '%s theme disabled.', '%s themes disabled.', $disabled ),
+ number_format_i18n( $disabled )
+ );
}
- echo '' . sprintf( $message, number_format_i18n( $disabled ) ) . '
';
} elseif ( isset( $_GET['deleted'] ) ) {
$deleted = absint( $_GET['deleted'] );
if ( 1 === $deleted ) {
$message = __( 'Theme deleted.' );
} else {
- /* translators: %s: Number of themes. */
- $message = _n( '%s theme deleted.', '%s themes deleted.', $deleted );
+ $message = sprintf(
+ /* translators: %s: Number of themes. */
+ _n( '%s theme deleted.', '%s themes deleted.', $deleted ),
+ number_format_i18n( $deleted )
+ );
}
- echo '' . sprintf( $message, number_format_i18n( $deleted ) ) . '
';
} elseif ( isset( $_GET['enabled-auto-update'] ) ) {
$enabled = absint( $_GET['enabled-auto-update'] );
if ( 1 === $enabled ) {
$message = __( 'Theme will be auto-updated.' );
} else {
- /* translators: %s: Number of themes. */
- $message = _n( '%s theme will be auto-updated.', '%s themes will be auto-updated.', $enabled );
+ $message = sprintf(
+ /* translators: %s: Number of themes. */
+ _n( '%s theme will be auto-updated.', '%s themes will be auto-updated.', $enabled ),
+ number_format_i18n( $enabled )
+ );
}
- echo '' . sprintf( $message, number_format_i18n( $enabled ) ) . '
';
} elseif ( isset( $_GET['disabled-auto-update'] ) ) {
$disabled = absint( $_GET['disabled-auto-update'] );
if ( 1 === $disabled ) {
$message = __( 'Theme will no longer be auto-updated.' );
} else {
- /* translators: %s: Number of themes. */
- $message = _n( '%s theme will no longer be auto-updated.', '%s themes will no longer be auto-updated.', $disabled );
+ $message = sprintf(
+ /* translators: %s: Number of themes. */
+ _n( '%s theme will no longer be auto-updated.', '%s themes will no longer be auto-updated.', $disabled ),
+ number_format_i18n( $disabled )
+ );
}
- echo '' . sprintf( $message, number_format_i18n( $disabled ) ) . '
';
} elseif ( isset( $_GET['error'] ) && 'none' === $_GET['error'] ) {
- echo '' . __( 'No theme selected.' ) . '
';
+ $message = __( 'No theme selected.' );
+ $type = 'error';
} elseif ( isset( $_GET['error'] ) && 'main' === $_GET['error'] ) {
- echo '' . __( 'You cannot delete a theme while it is active on the main site.' ) . '
';
+ $message = __( 'You cannot delete a theme while it is active on the main site.' );
+ $type = 'error';
}
+if ( '' !== $message ) {
+ wp_admin_notice(
+ $message,
+ array(
+ 'type' => $type,
+ 'dismissible' => true,
+ 'id' => 'message',
+ )
+ );
+}
?>