Changeset 56600 for trunk/src/wp-admin/plugins.php

Timestamp:

09/17/2023 03:31:32 PM (2 years ago)

Author:

joedolson

Message:

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

Add additional usage of wp_admin_notice() in wp-admin/ on .error and miscellaneous usages previously overlooked.

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

Props costdev, joedolson.
See #57791.

File:

• trunk/src/wp-admin/plugins.php (modified) (3 diffs)

trunk/src/wp-admin/plugins.php

@@ -340 +340 @@
                 <?php if ( 1 === $plugins_to_delete ) : ?>
                     <h1><?php _e( 'Delete Plugin' ); ?></h1>
-                    <?php if ( $have_non_network_plugins && is_network_admin() ) : ?>
-                        <div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'This plugin may be active on other sites in the network.' ); ?></p></div>
-                    <?php endif; ?>
+                    <?php
+                    if ( $have_non_network_plugins && is_network_admin() ) :
+                        $maybe_active_plugin = '<strong>' . __( 'Caution:' ) . '</strong> ' . __( 'This plugin may be active on other sites in the network.' );
+                        wp_admin_notice(
+                            $maybe_active_plugin,
+                            array(
+                                'additional_classes' => array( 'error' ),
+                            )
+                        );
+                    endif;
+                    ?>
                     <p><?php _e( 'You are about to remove the following plugin:' ); ?></p>
                 <?php else : ?>
                     <h1><?php _e( 'Delete Plugins' ); ?></h1>
-                    <?php if ( $have_non_network_plugins && is_network_admin() ) : ?>
-                        <div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'These plugins may be active on other sites in the network.' ); ?></p></div>
-                    <?php endif; ?>
+                    <?php
+                    if ( $have_non_network_plugins && is_network_admin() ) :
+                        $maybe_active_plugins = '<strong>' . __( 'Caution:' ) . '</strong> ' . __( 'These plugins may be active on other sites in the network.' );
+                        wp_admin_notice(
+                            $maybe_active_plugins,
+                            array(
+                                'additional_classes' => array( 'error' ),
+                            )
+                        );
+                    endif;
+                    ?>
                     <p><?php _e( 'You are about to remove the following plugins:' ); ?></p>
                 <?php endif; ?>
@@ -608 +624 @@
 if ( ! empty( $invalid ) ) {
     foreach ( $invalid as $plugin_file => $error ) {
-        echo '<div id="message" class="error"><p>';
-        printf(
+        $deactivated_message = sprintf(
             /* translators: 1: Plugin file, 2: Error message. */
             __( 'The plugin %1$s has been deactivated due to an error: %2$s' ),
@@ -615 +630 @@
             esc_html( $error->get_error_message() )
         );
-        echo '</p></div>';
+        wp_admin_notice(
+            $deactivated_message,
+            array(
+                'id'                 => 'message',
+                'additional_classes' => array( 'error' ),
+            )
+        );
     }
 }