<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[56571] trunk/src/wp-admin/includes: Administration: Use `wp_admin_notice()` in `/wp-admin/includes`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/56571">56571</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/56571","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>joedolson</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-09-14 01:11:29 +0000 (Thu, 14 Sep 2023)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Administration: Use `wp_admin_notice()` in `/wp-admin/includes`.
Add usages of `wp_admin_notice()` and `wp_get_admin_notice()` on `.notice-[type]` in the root level of `/wp-admin/includes`. Ongoing task to implement new function across core.
Props costdev, joedolson.
See <a href="https://core.trac.wordpress.org/ticket/57791">#57791</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasscustombackgroundphp">trunk/src/wp-admin/includes/class-custom-background.php</a></li>
<li><a href="#trunksrcwpadminincludesclasscustomimageheaderphp">trunk/src/wp-admin/includes/class-custom-image-header.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpplugininstalllisttablephp">trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppluginslisttablephp">trunk/src/wp-admin/includes/class-wp-plugins-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppostslisttablephp">trunk/src/wp-admin/includes/class-wp-posts-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpprivacypolicycontentphp">trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswptermslisttablephp">trunk/src/wp-admin/includes/class-wp-terms-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesmetaboxesphp">trunk/src/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunksrcwpadminincludesplugininstallphp">trunk/src/wp-admin/includes/plugin-install.php</a></li>
<li><a href="#trunksrcwpadminincludespluginphp">trunk/src/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
<li><a href="#trunksrcwpadminincludesthemephp">trunk/src/wp-admin/includes/theme.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatephp">trunk/src/wp-admin/includes/update.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasscustombackgroundphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-custom-background.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-custom-background.php 2023-09-14 00:52:45 UTC (rev 56570)
+++ trunk/src/wp-admin/includes/class-custom-background.php 2023-09-14 01:11:29 UTC (rev 56571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -239,21 +239,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap" id="custom-background">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1><?php _e( 'Custom Background' ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( current_user_can( 'customize' ) ) { ?>
-<div class="notice notice-info hide-if-no-customize">
- <p>
- <?php
- printf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( current_user_can( 'customize' ) ) {
+ $message = sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: URL to background image configuration in Customizer. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'You can now manage and live-preview Custom Backgrounds in the <a href="%s">Customizer</a>.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> admin_url( 'customize.php?autofocus[control]=background_image' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_admin_notice(
+ $message,
+ array(
+ 'type' => 'info',
+ 'additional_classes' => array( 'hide-if-no-customize' ),
+ )
+ );
+ }
+
+ if ( ! empty( $this->updated ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </p>
-</div>
- <?php } ?>
-
- <?php if ( ! empty( $this->updated ) ) { ?>
</del><span class="cx" style="display: block; padding: 0 10px"> <div id="message" class="updated">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasscustomimageheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-custom-image-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-custom-image-header.php 2023-09-14 00:52:45 UTC (rev 56570)
+++ trunk/src/wp-admin/includes/class-custom-image-header.php 2023-09-14 01:11:29 UTC (rev 56571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -509,19 +509,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1><?php _e( 'Custom Header' ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( current_user_can( 'customize' ) ) { ?>
-<div class="notice notice-info hide-if-no-customize">
- <p>
- <?php
- printf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( current_user_can( 'customize' ) ) {
+ $message = sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: URL to header image configuration in Customizer. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'You can now manage and live-preview Custom Header in the <a href="%s">Customizer</a>.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> admin_url( 'customize.php?autofocus[control]=header_image' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?>
- </p>
-</div>
- <?php } ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_admin_notice(
+ $message,
+ array(
+ 'type' => 'info',
+ 'additional_classes' => array( 'hide-if-no-customize' ),
+ )
+ );
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! empty( $this->updated ) ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="message" class="updated">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpplugininstalllisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2023-09-14 00:52:45 UTC (rev 56570)
+++ trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2023-09-14 01:11:29 UTC (rev 56571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -686,35 +686,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="plugin-card plugin-card-<?php echo sanitize_html_class( $plugin['slug'] ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $compatible_php || ! $compatible_wp ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<div class="notice inline notice-error notice-alt"><p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $incompatible_notice_message = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $compatible_php && ! $compatible_wp ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _e( 'This plugin does not work with your versions of WordPress and PHP.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $incompatible_notice_message .= __( 'This plugin does not work with your versions of WordPress and PHP.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $incompatible_notice_message .= sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: URL to WordPress Updates screen, 2: URL to Update PHP page. */
</span><span class="cx" style="display: block; padding: 0 10px"> ' ' . __( '<a href="%1$s">Please update WordPress</a>, and then <a href="%2$s">learn more about updating PHP</a>.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> self_admin_url( 'update-core.php' ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( wp_get_update_php_url() )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_update_php_annotation( '</p><p><em>', '</em>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $incompatible_notice_message .= wp_update_php_annotation( '</p><p><em>', '</em>', false );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( current_user_can( 'update_core' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $incompatible_notice_message .= sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: URL to WordPress Updates screen. */
</span><span class="cx" style="display: block; padding: 0 10px"> ' ' . __( '<a href="%s">Please update WordPress</a>.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> self_admin_url( 'update-core.php' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( current_user_can( 'update_php' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $incompatible_notice_message .= sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: URL to Update PHP page. */
</span><span class="cx" style="display: block; padding: 0 10px"> ' ' . __( '<a href="%s">Learn more about updating PHP</a>.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( wp_get_update_php_url() )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_update_php_annotation( '</p><p><em>', '</em>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $incompatible_notice_message .= wp_update_php_annotation( '</p><p><em>', '</em>', false );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! $compatible_wp ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _e( 'This plugin does not work with your version of WordPress.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $incompatible_notice_message .= __( 'This plugin does not work with your version of WordPress.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'update_core' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $incompatible_notice_message .= printf(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: URL to WordPress Updates screen. */
</span><span class="cx" style="display: block; padding: 0 10px"> ' ' . __( '<a href="%s">Please update WordPress</a>.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> self_admin_url( 'update-core.php' )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -721,17 +721,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! $compatible_php ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _e( 'This plugin does not work with your version of PHP.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $incompatible_notice_message .= __( 'This plugin does not work with your version of PHP.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'update_php' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $incompatible_notice_message .= sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: URL to Update PHP page. */
</span><span class="cx" style="display: block; padding: 0 10px"> ' ' . __( '<a href="%s">Learn more about updating PHP</a>.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( wp_get_update_php_url() )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_update_php_annotation( '</p><p><em>', '</em>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $incompatible_notice_message .= wp_update_php_annotation( '</p><p><em>', '</em>', false );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '</p></div>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ wp_admin_notice(
+ $incompatible_notice_message,
+ array(
+ 'type' => 'error',
+ 'additional_classes' => array( 'notice-alt', 'inline' ),
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="plugin-card-top">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppluginslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-plugins-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2023-09-14 00:52:45 UTC (rev 56570)
+++ trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2023-09-14 01:11:29 UTC (rev 56571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1243,7 +1243,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> echo apply_filters( 'plugin_auto_update_setting_html', $html, $plugin_file, $plugin_data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<div class="notice notice-error notice-alt inline hidden"><p></p></div>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_admin_notice(
+ '',
+ array(
+ 'type' => 'error',
+ 'additional_classes' => array( 'notice-alt', 'inline', 'hidden' ),
+ )
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '</td>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppostslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-posts-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2023-09-14 00:52:45 UTC (rev 56570)
+++ trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2023-09-14 01:11:29 UTC (rev 56571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2076,9 +2076,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="post_author" value="<?php echo esc_attr( $post->post_author ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="notice notice-error notice-alt inline hidden">
- <p class="error"></p>
- </div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ wp_admin_notice(
+ '<p class="error"></p>',
+ array(
+ 'type' => 'error',
+ 'additional_classes' => array( 'notice-alt', 'inline', 'hidden' ),
+ 'paragraph_wrap' => false,
+ )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div> <!-- end of .inline-edit-wrapper -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpprivacypolicycontentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php 2023-09-14 00:52:45 UTC (rev 56570)
+++ trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php 2023-09-14 01:11:29 UTC (rev 56571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -352,22 +352,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'after'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?>
- <div class="notice notice-warning inline wp-pp-notice">
- <p>
- <?php
- echo $message;
- printf(
- ' <a href="%s" target="_blank">%s <span class="screen-reader-text">%s</span></a>',
- $url,
- $label,
- /* translators: Hidden accessibility text. */
- __( '(opens in a new tab)' )
- );
- ?>
- </p>
- </div>
- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message .= sprintf(
+ ' <a href="%s" target="_blank">%s <span class="screen-reader-text">%s</span></a>',
+ $url,
+ $label,
+ /* translators: Hidden accessibility text. */
+ __( '(opens in a new tab)' )
+ );
+ wp_admin_notice(
+ $message,
+ array(
+ 'type' => 'warning',
+ 'additional_classes' => array( 'inline', 'wp-pp-notice' ),
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -394,8 +392,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $badge_title = sprintf( __( 'Removed %s.' ), $date );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Date of plugin deactivation. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $removed = __( 'You deactivated this plugin on %s and may no longer need this policy.' );
- $removed = '<div class="notice notice-info inline"><p>' . sprintf( $removed, $date ) . '</p></div>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $removed = sprintf( __( 'You deactivated this plugin on %s and may no longer need this policy.' ), $date );
+ $removed = wp_get_admin_notice(
+ $removed,
+ array(
+ 'type' => 'info',
+ 'additional_classes' => array( 'inline' ),
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $section['updated'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $badge_class = ' blue';
</span><span class="cx" style="display: block; padding: 0 10px"> $date = date_i18n( $date_format, $section['updated'] );
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswptermslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-terms-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-terms-list-table.php 2023-09-14 00:52:45 UTC (rev 56570)
+++ trunk/src/wp-admin/includes/class-wp-terms-list-table.php 2023-09-14 01:11:29 UTC (rev 56571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -711,9 +711,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="taxonomy" value="<?php echo esc_attr( $this->screen->taxonomy ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="post_type" value="<?php echo esc_attr( $this->screen->post_type ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="notice notice-error notice-alt inline hidden">
- <p class="error"></p>
- </div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ wp_admin_notice(
+ '<p class="error"></p>',
+ array(
+ 'type' => 'error',
+ 'additional_classes' => array( 'notice-alt', 'inline', 'hidden' ),
+ 'paragraph_wrap' => false,
+ )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/meta-boxes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/meta-boxes.php 2023-09-14 00:52:45 UTC (rev 56570)
+++ trunk/src/wp-admin/includes/meta-boxes.php 2023-09-14 01:11:29 UTC (rev 56571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -311,25 +311,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'draft' === $post->post_status && get_post_meta( $post_id, '_customize_changeset_uuid', true ) ) :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?>
- <div class="notice notice-info notice-alt inline">
- <p>
- <?php
- printf(
- /* translators: %s: URL to the Customizer. */
- __( 'This draft comes from your <a href="%s">unpublished customization changes</a>. You can edit, but there is no need to publish now. It will be published automatically with those changes.' ),
- esc_url(
- add_query_arg(
- 'changeset_uuid',
- rawurlencode( get_post_meta( $post_id, '_customize_changeset_uuid', true ) ),
- admin_url( 'customize.php' )
- )
- )
- );
- ?>
- </p>
- </div>
- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = sprintf(
+ /* translators: %s: URL to the Customizer. */
+ __( 'This draft comes from your <a href="%s">unpublished customization changes</a>. You can edit, but there is no need to publish now. It will be published automatically with those changes.' ),
+ esc_url(
+ add_query_arg(
+ 'changeset_uuid',
+ rawurlencode( get_post_meta( $post_id, '_customize_changeset_uuid', true ) ),
+ admin_url( 'customize.php' )
+ )
+ )
+ );
+ wp_admin_notice(
+ $message,
+ array(
+ 'type' => 'info',
+ 'additional_classes' => array( 'notice-alt', 'inline' ),
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpadminincludesplugininstallphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/plugin-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin-install.php 2023-09-14 00:52:45 UTC (rev 56570)
+++ trunk/src/wp-admin/includes/plugin-install.php 2023-09-14 01:11:29 UTC (rev 56571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -817,37 +817,54 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tested_wp = ( empty( $api->tested ) || version_compare( get_bloginfo( 'version' ), $api->tested, '<=' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $compatible_php ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<div class="notice notice-error notice-alt"><p>';
- _e( '<strong>Error:</strong> This plugin <strong>requires a newer version of PHP</strong>.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $compatible_php_notice_message = '<p>';
+ $compatible_php_notice_message .= __( '<strong>Error:</strong> This plugin <strong>requires a newer version of PHP</strong>.' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'update_php' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $compatible_php_notice_message .= sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: URL to Update PHP page. */
</span><span class="cx" style="display: block; padding: 0 10px"> ' ' . __( '<a href="%s" target="_blank">Click here to learn more about updating PHP</a>.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( wp_get_update_php_url() )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- );
-
- wp_update_php_annotation( '</p><p><em>', '</em>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) . wp_update_php_annotation( '</p><p><em>', '</em>', false );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $compatible_php_notice_message .= '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '</div>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ wp_admin_notice(
+ $compatible_php_notice_message,
+ array(
+ 'type' => 'error',
+ 'additional_classes' => array( 'notice-alt' ),
+ 'paragraph_wrap' => false,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $tested_wp ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<div class="notice notice-warning notice-alt"><p>';
- _e( '<strong>Warning:</strong> This plugin <strong>has not been tested</strong> with your current version of WordPress.' );
- echo '</p></div>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_admin_notice(
+ __( '<strong>Warning:</strong> This plugin <strong>has not been tested</strong> with your current version of WordPress.' ),
+ array(
+ 'type' => 'warning',
+ 'additional_classes' => array( 'notice-alt' ),
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! $compatible_wp ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<div class="notice notice-error notice-alt"><p>';
- _e( '<strong>Error:</strong> This plugin <strong>requires a newer version of WordPress</strong>.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $compatible_wp_notice_message = __( '<strong>Error:</strong> This plugin <strong>requires a newer version of WordPress</strong>.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'update_core' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $compatible_wp_notice_message .= sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: URL to WordPress Updates screen. */
</span><span class="cx" style="display: block; padding: 0 10px"> ' ' . __( '<a href="%s" target="_parent">Click here to update WordPress</a>.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( self_admin_url( 'update-core.php' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '</p></div>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ wp_admin_notice(
+ $compatible_wp_notice_message,
+ array(
+ 'type' => 'error',
+ 'additional_classes' => array( 'notice-alt' ),
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $api->sections as $section_name => $content ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludespluginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin.php 2023-09-14 00:52:45 UTC (rev 56570)
+++ trunk/src/wp-admin/includes/plugin.php 2023-09-14 01:11:29 UTC (rev 56571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2497,13 +2497,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf(
- '<div class="notice notice-error"><p><strong>%s</strong><br>%s</p><p><a href="%s">%s</a></p></div>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = sprintf(
+ '<strong>%s</strong><br>%s</p><p><a href="%s">%s</a>',
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'One or more plugins failed to load properly.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'You can find more details and make changes on the Plugins screen.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( admin_url( 'plugins.php?plugin_status=paused' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Go to the Plugins screen' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_admin_notice(
+ $message,
+ array( 'type' => 'error' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2571,8 +2575,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf(
- '<div class="notice notice-warning"><p><strong>%s</strong><br>%s</p><p><a href="%s">%s</a></p></div>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = sprintf(
+ '<strong>%s</strong><br>%s</p><p><a href="%s">%s</a>',
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Name of deactivated plugin. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( '%s plugin deactivated during WordPress upgrade.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2582,6 +2586,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( admin_url( 'plugins.php?plugin_status=inactive' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Go to the Plugins screen' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_admin_notice( $message, array( 'type' => 'warning' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Empty the options.
</span></span></pre></div>
<a id="trunksrcwpadminincludestemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/template.php 2023-09-14 00:52:45 UTC (rev 56570)
+++ trunk/src/wp-admin/includes/template.php 2023-09-14 01:11:29 UTC (rev 56571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -512,9 +512,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="cancel button"><?php _e( 'Cancel' ); ?></button>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="waiting spinner"></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="notice notice-error notice-alt inline hidden">
- <p class="error"></p>
- </div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ wp_admin_notice(
+ '<p class="error"></p>',
+ array(
+ 'type' => 'error',
+ 'additional_classes' => array( 'notice-alt', 'inline', 'hidden' ),
+ 'paragraph_wrap' => false,
+ )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="action" id="action" value="" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2776,9 +2783,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_posts_page_notice() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf(
- '<div class="notice notice-warning inline"><p>%s</p></div>',
- __( 'You are currently editing the page that shows your latest posts.' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_admin_notice(
+ __( 'You are currently editing the page that shows your latest posts.' ),
+ array(
+ 'type' => 'warning',
+ 'additional_classes' => array( 'inline' ),
+ )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/theme.php 2023-09-14 00:52:45 UTC (rev 56570)
+++ trunk/src/wp-admin/includes/theme.php 2023-09-14 01:11:29 UTC (rev 56571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1224,11 +1224,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf(
- '<div class="notice notice-error"><p><strong>%s</strong><br>%s</p><p><a href="%s">%s</a></p></div>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = sprintf(
+ '<p><strong>%s</strong><br>%s</p><p><a href="%s">%s</a></p>',
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'One or more themes failed to load properly.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'You can find more details and make changes on the Themes screen.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( admin_url( 'themes.php' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Go to the Themes screen' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_admin_notice(
+ $message,
+ array(
+ 'type' => 'error',
+ 'paragraph_wrap' => false,
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/update.php 2023-09-14 00:52:45 UTC (rev 56570)
+++ trunk/src/wp-admin/includes/update.php 2023-09-14 01:11:29 UTC (rev 56571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1049,19 +1049,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg( 'action', WP_Recovery_Mode::EXIT_ACTION, $url );
</span><span class="cx" style="display: block; padding: 0 10px"> $url = wp_nonce_url( $url, WP_Recovery_Mode::EXIT_ACTION );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?>
- <div class="notice notice-info">
- <p>
- <?php
- printf(
- /* translators: %s: Recovery Mode exit link. */
- __( 'You are in recovery mode. This means there may be an error with a theme or plugin. To exit recovery mode, log out or use the Exit button. <a href="%s">Exit Recovery Mode</a>' ),
- esc_url( $url )
- );
- ?>
- </p>
- </div>
- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = sprintf(
+ /* translators: %s: Recovery Mode exit link. */
+ __( 'You are in recovery mode. This means there may be an error with a theme or plugin. To exit recovery mode, log out or use the Exit button. <a href="%s">Exit Recovery Mode</a>' ),
+ esc_url( $url )
+ );
+ wp_admin_notice( $message, array( 'type' => 'info' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre>
</div>
</div>
</body>
</html>