<!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>[56597] trunk/src/wp-includes: Administration: Increase `wp_admin_notice()` usage in `/wp-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/56597">56597</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/56597","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>costdev</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-09-16 21:47:22 +0000 (Sat, 16 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: Increase `wp_admin_notice()` usage in `/wp-includes/`.
Adds further usages of `wp_admin_notice()` in the root level of `/wp-includes/` on `.error` and `.notice-info`.
Ongoing task to implement new function across core.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/56408">[56408]</a>, <a href="https://core.trac.wordpress.org/changeset/56409">[56409]</a>, <a href="https://core.trac.wordpress.org/changeset/56410">[56410]</a>, <a href="https://core.trac.wordpress.org/changeset/56518">[56518]</a>, <a href="https://core.trac.wordpress.org/changeset/56570">[56570]</a>, <a href="https://core.trac.wordpress.org/changeset/56571">[56571]</a>, <a href="https://core.trac.wordpress.org/changeset/56572">[56572]</a>, <a href="https://core.trac.wordpress.org/changeset/56573">[56573]</a>, <a href="https://core.trac.wordpress.org/changeset/56576">[56576]</a>, <a href="https://core.trac.wordpress.org/changeset/56589">[56589]</a>, <a href="https://core.trac.wordpress.org/changeset/56590">[56590]</a>.
Props joedolson, costdev.
See <a href="https://core.trac.wordpress.org/ticket/57791">#57791</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesmediatemplatephp">trunk/src/wp-includes/media-template.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetmediaaudiophp">trunk/src/wp-includes/widgets/class-wp-widget-media-audio.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetmediaimagephp">trunk/src/wp-includes/widgets/class-wp-widget-media-image.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetmediavideophp">trunk/src/wp-includes/widgets/class-wp-widget-media-video.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgettextphp">trunk/src/wp-includes/widgets/class-wp-widget-text.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/media-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media-template.php 2023-09-16 06:48:59 UTC (rev 56596)
+++ trunk/src/wp-includes/media-template.php 2023-09-16 21:47:22 UTC (rev 56597)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -375,7 +375,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="attachment-media-view {{ data.orientation }}">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['error'] ) && 'deprecated' === $_GET['error'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<div id="message" class="error notice"><p>' . __( 'The Edit Media screen is deprecated as of WordPress 6.3. Please use the Media Library instead.' ) . '</p></div>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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' ),
+ )
+ );
</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"> <h2 class="screen-reader-text"><?php /* translators: Hidden accessibility text. */ _e( 'Attachment Preview' ); ?></h2>
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetmediaaudiophp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/widgets/class-wp-widget-media-audio.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-media-audio.php 2023-09-16 06:48:59 UTC (rev 56596)
+++ trunk/src/wp-includes/widgets/class-wp-widget-media-audio.php 2023-09-16 21:47:22 UTC (rev 56597)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,13 +189,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/html" id="tmpl-wp-media-widget-audio-preview">
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.error && 'missing_attachment' === data.error ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="notice notice-error notice-alt notice-missing-attachment">
- <p><?php echo $this->l10n['missing_attachment']; ?></p>
- </div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ wp_admin_notice(
+ $this->l10n['missing_attachment'],
+ array(
+ 'type' => 'error',
+ 'additional_classes' => array( 'notice-alt', 'notice-missing-attachment' ),
+ )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } else if ( data.error ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="notice notice-error notice-alt">
- <p><?php _e( 'Unable to preview media due to an unknown error.' ); ?></p>
- </div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ wp_admin_notice(
+ __( 'Unable to preview media due to an unknown error.' ),
+ array(
+ 'type' => 'error',
+ 'additional_classes' => array( 'notice-alt' ),
+ )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } else if ( data.model && data.model.src ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_underscore_audio_template(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetmediaimagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/widgets/class-wp-widget-media-image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-media-image.php 2023-09-16 06:48:59 UTC (rev 56596)
+++ trunk/src/wp-includes/widgets/class-wp-widget-media-image.php 2023-09-16 21:47:22 UTC (rev 56597)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -363,13 +363,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/html" id="tmpl-wp-media-widget-image-preview">
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.error && 'missing_attachment' === data.error ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="notice notice-error notice-alt notice-missing-attachment">
- <p><?php echo $this->l10n['missing_attachment']; ?></p>
- </div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ wp_admin_notice(
+ $this->l10n['missing_attachment'],
+ array(
+ 'type' => 'error',
+ 'additional_classes' => array( 'notice-alt', 'notice-missing-attachment' ),
+ )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } else if ( data.error ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="notice notice-error notice-alt">
- <p><?php _e( 'Unable to preview media due to an unknown error.' ); ?></p>
- </div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ wp_admin_notice(
+ __( 'Unable to preview media due to an unknown error.' ),
+ array(
+ 'type' => 'error',
+ 'additional_classes' => array( 'notice-alt' ),
+ )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } else if ( data.url ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <img class="attachment-thumb" src="{{ data.url }}" draggable="false" alt="{{ data.alt }}"
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( ! data.alt && data.currentFilename ) { #>
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetmediavideophp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/widgets/class-wp-widget-media-video.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-media-video.php 2023-09-16 06:48:59 UTC (rev 56596)
+++ trunk/src/wp-includes/widgets/class-wp-widget-media-video.php 2023-09-16 21:47:22 UTC (rev 56597)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,17 +228,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/html" id="tmpl-wp-media-widget-video-preview">
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.error && 'missing_attachment' === data.error ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="notice notice-error notice-alt notice-missing-attachment">
- <p><?php echo $this->l10n['missing_attachment']; ?></p>
- </div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ wp_admin_notice(
+ $this->l10n['missing_attachment'],
+ array(
+ 'type' => 'error',
+ 'additional_classes' => array( 'notice-alt', 'notice-missing-attachment' ),
+ )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } else if ( data.error && 'unsupported_file_type' === data.error ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="notice notice-error notice-alt notice-missing-attachment">
- <p><?php echo $this->l10n['unsupported_file_type']; ?></p>
- </div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ wp_admin_notice(
+ $this->l10n['unsupported_file_type'],
+ array(
+ 'type' => 'error',
+ 'additional_classes' => array( 'notice-alt', 'notice-missing-attachment' ),
+ )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } else if ( data.error ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="notice notice-error notice-alt">
- <p><?php _e( 'Unable to preview media due to an unknown error.' ); ?></p>
- </div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ wp_admin_notice(
+ __( 'Unable to preview media due to an unknown error.' ),
+ array(
+ 'type' => 'error',
+ 'additional_classes' => array( 'notice-alt' ),
+ )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } else if ( data.is_oembed && data.model.poster ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="{{ data.model.src }}" target="_blank" class="media-widget-video-link">
</span><span class="cx" style="display: block; padding: 0 10px"> <img src="{{ data.model.poster }}" />
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgettextphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/widgets/class-wp-widget-text.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-text.php 2023-09-16 06:48:59 UTC (rev 56596)
+++ trunk/src/wp-includes/widgets/class-wp-widget-text.php 2023-09-16 21:47:22 UTC (rev 56597)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -495,13 +495,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $instance['title'] ); ?>" />
</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 inline notice-info notice-alt">
- <?php if ( ! isset( $instance['visual'] ) ) : ?>
- <p><?php _e( 'This widget may contain code that may work better in the “Custom HTML” widget. How about trying that widget instead?' ); ?></p>
- <?php else : ?>
- <p><?php _e( 'This widget may have contained code that may work better in the “Custom HTML” widget. If you have not yet, how about trying that widget instead?' ); ?></p>
- <?php endif; ?>
- </div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( ! isset( $instance['visual'] ) ) {
+ $widget_info_message = __( 'This widget may contain code that may work better in the “Custom HTML” widget. How about trying that widget instead?' );
+ } else {
+ $widget_info_message = __( 'This widget may have contained code that may work better in the “Custom HTML” widget. If you have not yet, how about trying that widget instead?' );
+ }
+
+ wp_admin_notice(
+ $widget_info_message,
+ array(
+ 'type' => 'info',
+ 'additional_classes' => array( 'notice-alt', 'inline' ),
+ )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="<?php echo $this->get_field_id( 'text' ); ?>"><?php _e( 'Content:' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <textarea class="widefat" rows="16" cols="20" id="<?php echo $this->get_field_id( 'text' ); ?>" name="<?php echo $this->get_field_name( 'text' ); ?>"><?php echo esc_textarea( $instance['text'] ); ?></textarea>
</span></span></pre>
</div>
</div>
</body>
</html>