WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Administration: Use `wp_admin_notice()` more in `/wp-admin/includes/`. 

Adds further usages of `wp_admin_notice()` in `/wp-admin/includes/` on `.notice-error`, `.notice-warning`, `.error`, and `.updated`.

Ongoing task to implement new function across core.

Follow-up to [56408], [56409], [56410], [56518], [56570], [56571], [56572], [56573], [56576], [56589], [56590], [56597].

Props joedolson, mukesh27, costdev.
See #57791.
Built from https://develop.svn.wordpress.org/trunk@56599


git-svn-id: http://core.svn.wordpress.org/trunk@56111 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
costdev 2023-09-17 15:23:22 +00:00
parent 3546f04e16
commit 6cdd74585d
15 changed files with 279 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-admin/includes/class-bulk-upgrader-skin.php
View File

@ -143,10 +143,16 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
echo '</p></div>'; echo '</p></div>';
if ( $this->error || ! $this->result ) { if ( $this->error || ! $this->result ) {
if ( $this->error ) { if ( $this->error ) {
echo '<div class="error"><p>' . sprintf( $this->upgrader->strings['skin_update_failed_error'], $title, '<strong>' . $this->error . '</strong>' ) . '</p></div>'; $after_error_message = sprintf( $this->upgrader->strings['skin_update_failed_error'], $title, '<strong>' . $this->error . '</strong>' );
} else { } else {
echo '<div class="error"><p>' . sprintf( $this->upgrader->strings['skin_update_failed'], $title ) . '</p></div>'; $after_error_message = sprintf( $this->upgrader->strings['skin_update_failed'], $title );
} }
wp_admin_notice(
$after_error_message,
array(
'additional_classes' => array( 'error' ),
)
);
echo '<script type="text/javascript">jQuery(\'#progress-' . esc_js( $this->upgrader->update_current ) . '\').show();</script>'; echo '<script type="text/javascript">jQuery(\'#progress-' . esc_js( $this->upgrader->update_current ) . '\').show();</script>';
} }

24
wp-admin/includes/class-custom-background.php
View File

@ -256,16 +256,20 @@ class Custom_Background {
} }
if ( ! empty( $this->updated ) ) { if ( ! empty( $this->updated ) ) {
?> $updated_message = sprintf(
<div id="message" class="updated"> /* translators: %s: Home URL. */
<p> __( 'Background updated. <a href="%s">Visit your site</a> to see how it looks.' ),
<?php esc_url( home_url( '/' ) )
/* translators: %s: Home URL. */ );
printf( __( 'Background updated. <a href="%s">Visit your site</a> to see how it looks.' ), esc_url( home_url( '/' ) ) ); wp_admin_notice(
?> $updated_message,
</p> array(
</div> 'id' => 'message',
<?php } ?> 'additional_classes' => array( 'updated' ),
)
);
}
?>
<h2><?php _e( 'Background Image' ); ?></h2> <h2><?php _e( 'Background Image' ); ?></h2>

26
wp-admin/includes/class-custom-image-header.php
View File

@ -524,18 +524,22 @@ class Custom_Image_Header {
) )
); );
} }
?>
<?php if ( ! empty( $this->updated ) ) { ?> if ( ! empty( $this->updated ) ) {
<div id="message" class="updated"> $updated_message = sprintf(
<p> /* translators: %s: Home URL. */
<?php __( 'Header updated. <a href="%s">Visit your site</a> to see how it looks.' ),
/* translators: %s: Home URL. */ esc_url( home_url( '/' ) )
printf( __( 'Header updated. <a href="%s">Visit your site</a> to see how it looks.' ), esc_url( home_url( '/' ) ) ); );
?> wp_admin_notice(
</p> $updated_message,
</div> array(
<?php } ?> 'id' => 'message',
'additional_classes' => array( 'updated' ),
)
);
}
?>
<h2><?php _e( 'Header Image' ); ?></h2> <h2><?php _e( 'Header Image' ); ?></h2>

15
wp-admin/includes/class-wp-plugin-install-list-table.php
View File

@ -290,10 +290,17 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
/** /**
*/ */
public function no_items() { public function no_items() {
if ( isset( $this->error ) ) { ?> if ( isset( $this->error ) ) {
<div class="inline error"><p><?php echo $this->error->get_error_message(); ?></p> $error_message = '<p>' . $this->error->get_error_message() . '</p>';
<p class="hide-if-no-js"><button class="button try-again"><?php _e( 'Try Again' ); ?></button></p> $error_message .= '<p class="hide-if-no-js"><button class="button try-again">' . __( 'Try Again' ) . '</button></p>';
</div> wp_admin_notice(
$error_message,
array(
'additional_classes' => array( 'inline', 'error' ),
'paragraph_wrap' => false,
)
);
?>
<?php } else { ?> <?php } else { ?>
<div class="no-plugin-results"><?php _e( 'No plugins found. Try a different search.' ); ?></div> <div class="no-plugin-results"><?php _e( 'No plugins found. Try a different search.' ); ?></div>
<?php <?php

34
wp-admin/includes/class-wp-plugins-list-table.php
View File

@ -1282,56 +1282,64 @@ class WP_Plugins_List_Table extends WP_List_Table {
printf( printf(
'<tr class="plugin-update-tr">' . '<tr class="plugin-update-tr">' .
'<td colspan="%s" class="plugin-update colspanchange">' . '<td colspan="%s" class="plugin-update colspanchange">' .
'<div class="update-message notice inline notice-error notice-alt"><p>',
esc_attr( $this->get_column_count() ) esc_attr( $this->get_column_count() )
); );
$incompatible_message = '';
if ( ! $compatible_php && ! $compatible_wp ) { if ( ! $compatible_php && ! $compatible_wp ) {
_e( 'This plugin does not work with your versions of WordPress and PHP.' ); $incompatible_message .= __( 'This plugin does not work with your versions of WordPress and PHP.' );
if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) { if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) {
printf( $incompatible_message .= sprintf(
/* translators: 1: URL to WordPress Updates screen, 2: URL to Update PHP page. */ /* translators: 1: URL to WordPress Updates screen, 2: URL to Update PHP page. */
' ' . __( '<a href="%1$s">Please update WordPress</a>, and then <a href="%2$s">learn more about updating PHP</a>.' ), ' ' . __( '<a href="%1$s">Please update WordPress</a>, and then <a href="%2$s">learn more about updating PHP</a>.' ),
self_admin_url( 'update-core.php' ), self_admin_url( 'update-core.php' ),
esc_url( wp_get_update_php_url() ) esc_url( wp_get_update_php_url() )
); );
wp_update_php_annotation( '</p><p><em>', '</em>' ); $incompatible_message .= wp_update_php_annotation( '</p><p><em>', '</em>', false );
} elseif ( current_user_can( 'update_core' ) ) { } elseif ( current_user_can( 'update_core' ) ) {
printf( $incompatible_message .= sprintf(
/* translators: %s: URL to WordPress Updates screen. */ /* translators: %s: URL to WordPress Updates screen. */
' ' . __( '<a href="%s">Please update WordPress</a>.' ), ' ' . __( '<a href="%s">Please update WordPress</a>.' ),
self_admin_url( 'update-core.php' ) self_admin_url( 'update-core.php' )
); );
} elseif ( current_user_can( 'update_php' ) ) { } elseif ( current_user_can( 'update_php' ) ) {
printf( $incompatible_message .= sprintf(
/* translators: %s: URL to Update PHP page. */ /* translators: %s: URL to Update PHP page. */
' ' . __( '<a href="%s">Learn more about updating PHP</a>.' ), ' ' . __( '<a href="%s">Learn more about updating PHP</a>.' ),
esc_url( wp_get_update_php_url() ) esc_url( wp_get_update_php_url() )
); );
wp_update_php_annotation( '</p><p><em>', '</em>' ); $incompatible_message .= wp_update_php_annotation( '</p><p><em>', '</em>', false );
} }
} elseif ( ! $compatible_wp ) { } elseif ( ! $compatible_wp ) {
_e( 'This plugin does not work with your version of WordPress.' ); $incompatible_message .= __( 'This plugin does not work with your version of WordPress.' );
if ( current_user_can( 'update_core' ) ) { if ( current_user_can( 'update_core' ) ) {
printf( $incompatible_message .= sprintf(
/* translators: %s: URL to WordPress Updates screen. */ /* translators: %s: URL to WordPress Updates screen. */
' ' . __( '<a href="%s">Please update WordPress</a>.' ), ' ' . __( '<a href="%s">Please update WordPress</a>.' ),
self_admin_url( 'update-core.php' ) self_admin_url( 'update-core.php' )
); );
} }
} elseif ( ! $compatible_php ) { } elseif ( ! $compatible_php ) {
_e( 'This plugin does not work with your version of PHP.' ); $incompatible_message .= __( 'This plugin does not work with your version of PHP.' );
if ( current_user_can( 'update_php' ) ) { if ( current_user_can( 'update_php' ) ) {
printf( $incompatible_message .= sprintf(
/* translators: %s: URL to Update PHP page. */ /* translators: %s: URL to Update PHP page. */
' ' . __( '<a href="%s">Learn more about updating PHP</a>.' ), ' ' . __( '<a href="%s">Learn more about updating PHP</a>.' ),
esc_url( wp_get_update_php_url() ) esc_url( wp_get_update_php_url() )
); );
wp_update_php_annotation( '</p><p><em>', '</em>' ); $incompatible_message .= wp_update_php_annotation( '</p><p><em>', '</em>', false );
} }
} }
echo '</p></div></td></tr>'; wp_admin_notice(
$incompatible_message,
array(
'type' => 'error',
'additional_classes' => array( 'notice-alt', 'inline', 'update-message' ),
)
);
echo '</td></tr>';
} }
/** /**

27
wp-admin/includes/class-wp-privacy-policy-content.php
View File

@ -138,19 +138,20 @@ final class WP_Privacy_Policy_Content {
return; return;
} }
?> $privacy_message = sprintf(
<div class="policy-text-updated notice notice-warning is-dismissible"> /* translators: %s: Privacy Policy Guide URL. */
<p> __( 'The suggested privacy policy text has changed. Please <a href="%s">review the guide</a> and update your privacy policy.' ),
<?php esc_url( admin_url( 'privacy-policy-guide.php?tab=policyguide' ) )
printf( );
/* translators: %s: Privacy Policy Guide URL. */
__( 'The suggested privacy policy text has changed. Please <a href="%s">review the guide</a> and update your privacy policy.' ), wp_admin_notice(
esc_url( admin_url( 'privacy-policy-guide.php?tab=policyguide' ) ) $privacy_message,
); array(
?> 'type' => 'warning',
</p> 'additional_classes' => array( 'policy-text-updated' ),
</div> 'dismissible' => true,
<?php )
);
} }
/** /**

50
wp-admin/includes/dashboard.php
View File

@ -573,9 +573,16 @@ function wp_dashboard_quick_press( $error_msg = false ) {
<form name="post" action="<?php echo esc_url( admin_url( 'post.php' ) ); ?>" method="post" id="quick-press" class="initial-form hide-if-no-js"> <form name="post" action="<?php echo esc_url( admin_url( 'post.php' ) ); ?>" method="post" id="quick-press" class="initial-form hide-if-no-js">
<?php if ( $error_msg ) : ?> <?php
<div class="error"><?php echo $error_msg; ?></div> if ( $error_msg ) {
<?php endif; ?> wp_admin_notice(
$error_msg,
array(
'additional_classes' => array( 'error' ),
)
);
}
?>
<div class="input-text-wrap" id="title-wrap"> <div class="input-text-wrap" id="title-wrap">
<label for="title"> <label for="title">
@ -1157,8 +1164,15 @@ function wp_dashboard_rss_output( $widget_id ) {
* @return bool True on success, false on failure. * @return bool True on success, false on failure.
*/ */
function wp_dashboard_cached_rss_widget( $widget_id, $callback, $check_urls = array(), ...$args ) { function wp_dashboard_cached_rss_widget( $widget_id, $callback, $check_urls = array(), ...$args ) {
$loading = '<p class="widget-loading hide-if-no-js">' . __( 'Loading&hellip;' ) . '</p><div class="hide-if-js notice notice-error inline"><p>' . __( 'This widget requires JavaScript.' ) . '</p></div>';
$doing_ajax = wp_doing_ajax(); $doing_ajax = wp_doing_ajax();
$loading = '<p class="widget-loading hide-if-no-js">' . __( 'Loading&hellip;' ) . '</p>';
$loading .= wp_get_admin_notice(
__( 'This widget requires JavaScript.' ),
array(
'type' => 'error',
'additional_classes' => array( 'inline', 'hide-if-js' ),
)
);
if ( empty( $check_urls ) ) { if ( empty( $check_urls ) ) {
$widgets = get_option( 'dashboard_widget_options' ); $widgets = get_option( 'dashboard_widget_options' );
@ -1340,25 +1354,19 @@ function wp_dashboard_events_news() {
* @since 4.8.0 * @since 4.8.0
*/ */
function wp_print_community_events_markup() { function wp_print_community_events_markup() {
?> $community_events_notice = '<p class="hide-if-js">' . ( 'This widget requires JavaScript.' ) . '</p>';
$community_events_notice .= '<p class="community-events-error-occurred" aria-hidden="true">' . __( 'An error occurred. Please try again.' ) . '</p>';
$community_events_notice .= '<p class="community-events-could-not-locate" aria-hidden="true"></p>';
<div class="community-events-errors notice notice-error inline hide-if-js"> wp_admin_notice(
<p class="hide-if-js"> $community_events_notice,
<?php _e( 'This widget requires JavaScript.' ); ?> array(
</p> 'type' => 'error',
'additional_classes' => array( 'community-events-errors', 'inline', 'hide-if-js' ),
'paragraph_wrap' => false,
)
);
<p class="community-events-error-occurred" aria-hidden="true">
<?php _e( 'An error occurred. Please try again.' ); ?>
</p>
<p class="community-events-could-not-locate" aria-hidden="true"></p>
</div>
<div class="community-events-loading hide-if-no-js">
<?php _e( 'Loading&hellip;' ); ?>
</div>
<?php
/* /*
* Hide the main element when the page first loads, because the content * Hide the main element when the page first loads, because the content
* won't be ready until wp.communityEvents.renderEventsTemplate() has run. * won't be ready until wp.communityEvents.renderEventsTemplate() has run.

8
wp-admin/includes/file.php
View File

@ -2426,7 +2426,13 @@ function request_filesystem_credentials( $form_post, $type = '', $error = false,
if ( is_wp_error( $error ) ) { if ( is_wp_error( $error ) ) {
$error_string = esc_html( $error->get_error_message() ); $error_string = esc_html( $error->get_error_message() );
} }
echo '<div id="message" class="error"><p>' . $error_string . '</p></div>'; wp_admin_notice(
$error_string,
array(
'id' => 'message',
'additional_classes' => array( 'error' ),
)
);
} }
$types = array(); $types = array();

13
wp-admin/includes/ms.php
View File

@ -692,11 +692,20 @@ function site_admin_notice() {
} }
if ( (int) get_site_option( 'wpmu_upgrade_site' ) !== $wp_db_version ) { if ( (int) get_site_option( 'wpmu_upgrade_site' ) !== $wp_db_version ) {
echo "<div class='update-nag notice notice-warning inline'>" . sprintf( $upgrade_network_message = sprintf(
/* translators: %s: URL to Upgrade Network screen. */ /* translators: %s: URL to Upgrade Network screen. */
__( 'Thank you for Updating! Please visit the <a href="%s">Upgrade Network</a> page to update all your sites.' ), __( 'Thank you for Updating! Please visit the <a href="%s">Upgrade Network</a> page to update all your sites.' ),
esc_url( network_admin_url( 'upgrade.php' ) ) esc_url( network_admin_url( 'upgrade.php' ) )
) . '</div>'; );
wp_admin_notice(
$upgrade_network_message,
array(
'type' => 'warning',
'additional_classes' => array( 'update-nag', 'inline' ),
'paragraph_wrap' => false,
)
);
} }
} }

8
wp-admin/includes/nav-menu.php
View File

@ -1437,7 +1437,13 @@ function wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selecte
); );
if ( is_wp_error( $menu_item_db_id ) ) { if ( is_wp_error( $menu_item_db_id ) ) {
$messages[] = '<div id="message" class="error"><p>' . $menu_item_db_id->get_error_message() . '</p></div>'; $messages[] = wp_get_admin_notice(
$menu_item_db_id->get_error_message(),
array(
'id' => 'message',
'additional_classes' => array( 'error' ),
)
);
} else { } else {
unset( $menu_items[ $menu_item_db_id ] ); unset( $menu_items[ $menu_item_db_id ] );
} }

85
wp-admin/includes/network.php
View File

@ -113,11 +113,20 @@ function network_step1( $errors = false ) {
global $is_apache; global $is_apache;
if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) { if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
echo '<div class="error"><p><strong>' . __( 'Error:' ) . '</strong> ' . sprintf( $cannot_define_constant_message = '<strong>' . __( 'Error:' ) . '</strong> ';
$cannot_define_constant_message .= sprintf(
/* translators: %s: DO_NOT_UPGRADE_GLOBAL_TABLES */ /* translators: %s: DO_NOT_UPGRADE_GLOBAL_TABLES */
__( 'The constant %s cannot be defined when creating a network.' ), __( 'The constant %s cannot be defined when creating a network.' ),
'<code>DO_NOT_UPGRADE_GLOBAL_TABLES</code>' '<code>DO_NOT_UPGRADE_GLOBAL_TABLES</code>'
) . '</p></div>'; );
wp_admin_notice(
$cannot_define_constant_message,
array(
'additional_classes' => array( 'error' ),
)
);
echo '</div>'; echo '</div>';
require_once ABSPATH . 'wp-admin/admin-footer.php'; require_once ABSPATH . 'wp-admin/admin-footer.php';
die(); die();
@ -142,7 +151,13 @@ function network_step1( $errors = false ) {
$hostname = get_clean_basedomain(); $hostname = get_clean_basedomain();
$has_ports = strstr( $hostname, ':' ); $has_ports = strstr( $hostname, ':' );
if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ), true ) ) ) { if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ), true ) ) ) {
echo '<div class="error"><p><strong>' . __( 'Error:' ) . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</p></div>'; wp_admin_notice(
'<strong>' . __( 'Error:' ) . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ),
array(
'additional_classes' => array( 'error' ),
)
);
echo '<p>' . sprintf( echo '<p>' . sprintf(
/* translators: %s: Port number. */ /* translators: %s: Port number. */
__( 'You cannot use port numbers such as %s.' ), __( 'You cannot use port numbers such as %s.' ),
@ -160,11 +175,17 @@ function network_step1( $errors = false ) {
$error_codes = array(); $error_codes = array();
if ( is_wp_error( $errors ) ) { if ( is_wp_error( $errors ) ) {
echo '<div class="error"><p><strong>' . __( 'Error: The network could not be created.' ) . '</strong></p>'; $network_created_error_message = '<p><strong>' . __( 'Error: The network could not be created.' ) . '</strong></p>';
foreach ( $errors->get_error_messages() as $error ) { foreach ( $errors->get_error_messages() as $error ) {
echo "<p>$error</p>"; $network_created_error_message .= "<p>$error</p>";
} }
echo '</div>'; wp_admin_notice(
$network_created_error_message,
array(
'additional_classes' => array( 'error' ),
'paragraph_wrap' => false,
)
);
$error_codes = $errors->get_error_codes(); $error_codes = $errors->get_error_codes();
} }
@ -195,33 +216,39 @@ function network_step1( $errors = false ) {
$subdomain_install = false; $subdomain_install = false;
$got_mod_rewrite = got_mod_rewrite(); $got_mod_rewrite = got_mod_rewrite();
if ( $got_mod_rewrite ) { // Dangerous assumptions. if ( $got_mod_rewrite ) { // Dangerous assumptions.
echo '<div class="updated inline"><p><strong>' . __( 'Note:' ) . '</strong> '; $message_class = 'updated';
printf( $message = '<p><strong>' . __( 'Warning:' ) . '</strong> ';
$message .= '<p>' . sprintf(
/* translators: %s: mod_rewrite */ /* translators: %s: mod_rewrite */
__( 'Please make sure the Apache %s module is installed as it will be used at the end of this installation.' ), __( 'Please make sure the Apache %s module is installed as it will be used at the end of this installation.' ),
'<code>mod_rewrite</code>' '<code>mod_rewrite</code>'
); ) . '</p>';
echo '</p>';
} elseif ( $is_apache ) { } elseif ( $is_apache ) {
echo '<div class="error inline"><p><strong>' . __( 'Warning:' ) . '</strong> '; $message_class = 'error';
printf( $message = '<p><strong>' . __( 'Warning:' ) . '</strong> ';
$message .= sprintf(
/* translators: %s: mod_rewrite */ /* translators: %s: mod_rewrite */
__( 'It looks like the Apache %s module is not installed.' ), __( 'It looks like the Apache %s module is not installed.' ),
'<code>mod_rewrite</code>' '<code>mod_rewrite</code>'
); ) . '</p>';
echo '</p>';
} }
if ( $got_mod_rewrite || $is_apache ) { // Protect against mod_rewrite mimicry (but ! Apache). if ( $got_mod_rewrite || $is_apache ) { // Protect against mod_rewrite mimicry (but ! Apache).
echo '<p>'; $message .= '<p>' . sprintf(
printf(
/* translators: 1: mod_rewrite, 2: mod_rewrite documentation URL, 3: Google search for mod_rewrite. */ /* translators: 1: mod_rewrite, 2: mod_rewrite documentation URL, 3: Google search for mod_rewrite. */
__( 'If %1$s is disabled, ask your administrator to enable that module, or look at the <a href="%2$s">Apache documentation</a> or <a href="%3$s">elsewhere</a> for help setting it up.' ), __( 'If %1$s is disabled, ask your administrator to enable that module, or look at the <a href="%2$s">Apache documentation</a> or <a href="%3$s">elsewhere</a> for help setting it up.' ),
'<code>mod_rewrite</code>', '<code>mod_rewrite</code>',
'https://httpd.apache.org/docs/mod/mod_rewrite.html', 'https://httpd.apache.org/docs/mod/mod_rewrite.html',
'https://www.google.com/search?q=apache+mod_rewrite' 'https://www.google.com/search?q=apache+mod_rewrite'
) . '</p>';
wp_admin_notice(
$message,
array(
'additional_classes' => array( $message_class, 'inline' ),
'paragraph_wrap' => false,
)
); );
echo '</p></div>';
} }
} }
@ -263,7 +290,14 @@ function network_step1( $errors = false ) {
endif; endif;
if ( WP_CONTENT_DIR !== ABSPATH . 'wp-content' && ( allow_subdirectory_install() || ! allow_subdomain_install() ) ) { if ( WP_CONTENT_DIR !== ABSPATH . 'wp-content' && ( allow_subdirectory_install() || ! allow_subdomain_install() ) ) {
echo '<div class="error inline"><p><strong>' . __( 'Warning:' ) . '</strong> ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</p></div>'; $subdirectory_warning_message = '<strong>' . __( 'Warning:' ) . '</strong> ';
$subdirectory_warning_message .= __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' );
wp_admin_notice(
$subdirectory_warning_message,
array(
'additional_classes' => array( 'error', 'inline' ),
)
);
} }
$is_www = str_starts_with( $hostname, 'www.' ); $is_www = str_starts_with( $hostname, 'www.' );
@ -409,7 +443,12 @@ function network_step2( $errors = false ) {
// Wildcard DNS message. // Wildcard DNS message.
if ( is_wp_error( $errors ) ) { if ( is_wp_error( $errors ) ) {
echo '<div class="error">' . $errors->get_error_message() . '</div>'; wp_admin_notice(
$errors->get_error_message(),
array(
'additional_classes' => array( 'error' ),
)
);
} }
if ( $_POST ) { if ( $_POST ) {
@ -426,8 +465,14 @@ function network_step2( $errors = false ) {
<?php <?php
} else { } else {
$subdomain_install = (bool) $wpdb->get_var( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = 1 AND meta_key = 'subdomain_install'" ); $subdomain_install = (bool) $wpdb->get_var( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = 1 AND meta_key = 'subdomain_install'" );
wp_admin_notice(
'<strong>' . __( 'Warning:' ) . '</strong> ' . __( 'An existing WordPress network was detected.' ),
array(
'additional_classes' => array( 'error' ),
)
);
?> ?>
<div class="error"><p><strong><?php _e( 'Warning:' ); ?></strong> <?php _e( 'An existing WordPress network was detected.' ); ?></p></div>
<p><?php _e( 'Please complete the configuration steps. To create a new network, you will need to empty or remove the network database tables.' ); ?></p> <p><?php _e( 'Please complete the configuration steps. To create a new network, you will need to empty or remove the network database tables.' ); ?></p>
<?php <?php
} }

61
wp-admin/includes/template.php
View File

@ -1013,10 +1013,15 @@ function wp_import_upload_form( $action ) {
$size = size_format( $bytes ); $size = size_format( $bytes );
$upload_dir = wp_upload_dir(); $upload_dir = wp_upload_dir();
if ( ! empty( $upload_dir['error'] ) ) : if ( ! empty( $upload_dir['error'] ) ) :
?> $upload_directory_error = '<p>' . __( 'Before you can upload your import file, you will need to fix the following error:' ) . '</p>';
<div class="error"><p><?php _e( 'Before you can upload your import file, you will need to fix the following error:' ); ?></p> $upload_directory_error .= '<p><strong>' . $upload_dir['error'] . '</strong></p>';
<p><strong><?php echo $upload_dir['error']; ?></strong></p></div> wp_admin_notice(
<?php $upload_directory_error,
array(
'additonal_classes' => array( 'error' ),
'paragraph_wrap' => false,
)
);
else : else :
?> ?>
<form enctype="multipart/form-data" id="import-upload-form" method="post" class="wp-upload-form" action="<?php echo esc_url( wp_nonce_url( $action, 'import-upload' ) ); ?>"> <form enctype="multipart/form-data" id="import-upload-form" method="post" class="wp-upload-form" action="<?php echo esc_url( wp_nonce_url( $action, 'import-upload' ) ); ?>">
@ -1434,16 +1439,17 @@ function do_meta_boxes( $screen, $context, $data_object ) {
if ( WP_DEBUG && ! $block_compatible && 'edit' === $screen->parent_base && ! $screen->is_block_editor() && ! isset( $_GET['meta-box-loader'] ) ) { if ( WP_DEBUG && ! $block_compatible && 'edit' === $screen->parent_base && ! $screen->is_block_editor() && ! isset( $_GET['meta-box-loader'] ) ) {
$plugin = _get_plugin_from_callback( $box['callback'] ); $plugin = _get_plugin_from_callback( $box['callback'] );
if ( $plugin ) { if ( $plugin ) {
?> $meta_box_not_compatible_message = sprintf(
<div class="error inline"> /* translators: %s: The name of the plugin that generated this meta box. */
<p> __( 'This meta box, from the %s plugin, is not compatible with the block editor.' ),
<?php "<strong>{$plugin['Name']}</strong>"
/* translators: %s: The name of the plugin that generated this meta box. */ );
printf( __( 'This meta box, from the %s plugin, is not compatible with the block editor.' ), "<strong>{$plugin['Name']}</strong>" ); wp_admin_notice(
?> $meta_box_not_compatible_message,
</p> array(
</div> 'additional_classes' => array( 'error', 'inline' ),
<?php )
);
} }
} }
@ -2695,17 +2701,22 @@ function convert_to_screen( $hook_name ) {
* @access private * @access private
*/ */
function _local_storage_notice() { function _local_storage_notice() {
?> $local_storage_message = '<p class="local-restore">';
<div id="local-storage-notice" class="hidden notice is-dismissible"> $local_storage_message .= __( 'The backup of this post in your browser is different from the version below.' );
<p class="local-restore"> $local_storage_message .= '<button type="button" class="button restore-backup">' . __( 'Restore the backup' ) . '</button></p>';
<?php _e( 'The backup of this post in your browser is different from the version below.' ); ?> $local_storage_message .= '<p class="help">';
<button type="button" class="button restore-backup"><?php _e( 'Restore the backup' ); ?></button> $local_storage_message .= __( 'This will replace the current editor content with the last backup version. You can use undo and redo in the editor to get the old content back or to return to the restored version.' );
</p> $local_storage_message .= '</p>';
<p class="help">
<?php _e( 'This will replace the current editor content with the last backup version. You can use undo and redo in the editor to get the old content back or to return to the restored version.' ); ?> wp_admin_notice(
</p> $local_storage_message,
</div> array(
<?php 'id' => 'local-storage-notice',
'additional_classes' => array( 'hidden' ),
'dismissible' => true,
'paragraph_wrap' => false,
)
);
} }
/** /**

18
wp-admin/includes/update.php
View File

@ -342,7 +342,14 @@ function update_nag() {
); );
} }
echo "<div class='update-nag notice notice-warning inline'>$msg</div>"; wp_admin_notice(
$msg,
array(
'type' => 'warning',
'additonal_classes' => array( 'update-nag', 'inline' ),
'paragraph_wrap' => false,
)
);
} }
/** /**
@ -884,7 +891,14 @@ function maintenance_nag() {
$msg = __( 'An automated WordPress update has failed to complete! Please notify the site administrator.' ); $msg = __( 'An automated WordPress update has failed to complete! Please notify the site administrator.' );
} }
echo "<div class='update-nag notice notice-warning inline'>$msg</div>"; wp_admin_notice(
$msg,
array(
'type' => 'warning',
'additional_classes' => array( 'update-nag', 'inline' ),
'paragraph_wrap' => false,
)
);
} }
/** /**

46
wp-admin/includes/user.php
View File

@ -535,28 +535,30 @@ function default_password_nag() {
if ( 'profile.php' === $pagenow || ! get_user_option( 'default_password_nag' ) ) { if ( 'profile.php' === $pagenow || ! get_user_option( 'default_password_nag' ) ) {
return; return;
} }
?>
<div class="error default-password-nag"> $default_password_nag_message = sprintf(
<p> '<p><strong>%1$s</strong> %2$s</p>',
<strong><?php _e( 'Notice:' ); ?></strong> __( 'Notice:' ),
<?php _e( 'You are using the auto-generated password for your account. Would you like to change it?' ); ?> __( 'You are using the auto-generated password for your account. Would you like to change it?' )
</p> );
<p> $default_password_nag_message .= sprintf(
<?php '<p><a href="%1$s">%2$s</a> | ',
printf( esc_url( get_edit_profile_url() . '#password' ),
'<a href="%1$s">%2$s</a> | ', __( 'Yes, take me to my profile page' )
esc_url( get_edit_profile_url() . '#password' ), );
__( 'Yes, take me to my profile page' ) $default_password_nag_message .= sprintf(
); '<a href="%1$s" id="default-password-nag-no">%2$s</a></p>',
printf( '?default_password_nag=0',
'<a href="%1$s" id="default-password-nag-no">%2$s</a>', __( 'No thanks, do not remind me again' )
'?default_password_nag=0', );
__( 'No thanks, do not remind me again' )
); wp_admin_notice(
?> $default_password_nag_message,
</p> array(
</div> 'additional_classes' => array( 'error', 'default-password-nag' ),
<?php 'paragraph_wrap' => false,
)
);
} }
/** /**

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.4-alpha-56598'; $wp_version = '6.4-alpha-56599';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.