Changeset 56597

Timestamp:

09/16/2023 09:47:22 PM (16 months ago)

Author:

costdev

Message:

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 [56408], [56409], [56410], [56518], [56570], [56571], [56572], [56573], [56576], [56589], [56590].

Props joedolson, costdev.
See #57791.

Location:

trunk/src/wp-includes

Files:

• media-template.php (modified) (1 diff)
• widgets/class-wp-widget-media-audio.php (modified) (1 diff)
• widgets/class-wp-widget-media-image.php (modified) (1 diff)
• widgets/class-wp-widget-media-video.php (modified) (1 diff)
• widgets/class-wp-widget-text.php (modified) (1 diff)

trunk/src/wp-includes/media-template.php

@@ -376 +376 @@
             <?php
             if ( isset( $_GET['error'] ) && 'deprecated' === $_GET['error'] ) {
-                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>';
+                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' ),
+                    )
+                );
             }
             ?>

trunk/src/wp-includes/widgets/class-wp-widget-media-audio.php

@@ -190 +190 @@
         <script type="text/html" id="tmpl-wp-media-widget-audio-preview">
             <# if ( data.error && 'missing_attachment' === data.error ) { #>
-                <div class="notice notice-error notice-alt notice-missing-attachment">
-                    <p><?php echo $this->l10n['missing_attachment']; ?></p>
-                </div>
+                <?php
+                wp_admin_notice(
+                    $this->l10n['missing_attachment'],
+                    array(
+                        'type'               => 'error',
+                        'additional_classes' => array( 'notice-alt', 'notice-missing-attachment' ),
+                    )
+                );
+                ?>
             <# } else if ( data.error ) { #>
-                <div class="notice notice-error notice-alt">
-                    <p><?php _e( 'Unable to preview media due to an unknown error.' ); ?></p>
-                </div>
+                <?php
+                wp_admin_notice(
+                    __( 'Unable to preview media due to an unknown error.' ),
+                    array(
+                        'type'               => 'error',
+                        'additional_classes' => array( 'notice-alt' ),
+                    )
+                );
+                ?>
             <# } else if ( data.model && data.model.src ) { #>
                 <?php wp_underscore_audio_template(); ?>

trunk/src/wp-includes/widgets/class-wp-widget-media-image.php

@@ -364 +364 @@
         <script type="text/html" id="tmpl-wp-media-widget-image-preview">
             <# if ( data.error && 'missing_attachment' === data.error ) { #>
-                <div class="notice notice-error notice-alt notice-missing-attachment">
-                    <p><?php echo $this->l10n['missing_attachment']; ?></p>
-                </div>
+                <?php
+                wp_admin_notice(
+                    $this->l10n['missing_attachment'],
+                    array(
+                        'type'               => 'error',
+                        'additional_classes' => array( 'notice-alt', 'notice-missing-attachment' ),
+                    )
+                );
+                ?>
             <# } else if ( data.error ) { #>
-                <div class="notice notice-error notice-alt">
-                    <p><?php _e( 'Unable to preview media due to an unknown error.' ); ?></p>
-                </div>
+                <?php
+                wp_admin_notice(
+                    __( 'Unable to preview media due to an unknown error.' ),
+                    array(
+                        'type'               => 'error',
+                        'additional_classes' => array( 'notice-alt' ),
+                    )
+                );
+                ?>
             <# } else if ( data.url ) { #>
                 <img class="attachment-thumb" src="{{ data.url }}" draggable="false" alt="{{ data.alt }}"

trunk/src/wp-includes/widgets/class-wp-widget-media-video.php

@@ -229 +229 @@
         <script type="text/html" id="tmpl-wp-media-widget-video-preview">
             <# if ( data.error && 'missing_attachment' === data.error ) { #>
-                <div class="notice notice-error notice-alt notice-missing-attachment">
-                    <p><?php echo $this->l10n['missing_attachment']; ?></p>
-                </div>
+                <?php
+                wp_admin_notice(
+                    $this->l10n['missing_attachment'],
+                    array(
+                        'type'               => 'error',
+                        'additional_classes' => array( 'notice-alt', 'notice-missing-attachment' ),
+                    )
+                );
+                ?>
             <# } else if ( data.error && 'unsupported_file_type' === data.error ) { #>
-                <div class="notice notice-error notice-alt notice-missing-attachment">
-                    <p><?php echo $this->l10n['unsupported_file_type']; ?></p>
-                </div>
+                <?php
+                wp_admin_notice(
+                    $this->l10n['unsupported_file_type'],
+                    array(
+                        'type'               => 'error',
+                        'additional_classes' => array( 'notice-alt', 'notice-missing-attachment' ),
+                    )
+                );
+                ?>
             <# } else if ( data.error ) { #>
-                <div class="notice notice-error notice-alt">
-                    <p><?php _e( 'Unable to preview media due to an unknown error.' ); ?></p>
-                </div>
+                <?php
+                wp_admin_notice(
+                    __( 'Unable to preview media due to an unknown error.' ),
+                    array(
+                        'type'               => 'error',
+                        'additional_classes' => array( 'notice-alt' ),
+                    )
+                );
+                ?>
             <# } else if ( data.is_oembed && data.model.poster ) { #>
                 <a href="{{ data.model.src }}" target="_blank" class="media-widget-video-link">

trunk/src/wp-includes/widgets/class-wp-widget-text.php

@@ -496 +496 @@
                 <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'] ); ?>" />
             </p>
-            <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 &#8220;Custom HTML&#8221; 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 &#8220;Custom HTML&#8221; widget. If you have not yet, how about trying that widget instead?' ); ?></p>
-                <?php endif; ?>
-            </div>
+            <?php
+            if ( ! isset( $instance['visual'] ) ) {
+                $widget_info_message = __( 'This widget may contain code that may work better in the &#8220;Custom HTML&#8221; widget. How about trying that widget instead?' );
+            } else {
+                $widget_info_message = __( 'This widget may have contained code that may work better in the &#8220;Custom HTML&#8221; 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' ),
+                )
+            );
+            ?>
             <p>
                 <label for="<?php echo $this->get_field_id( 'text' ); ?>"><?php _e( 'Content:' ); ?></label>