Changeset 56409 for trunk/src/wp-admin/network/themes.php

Timestamp:

08/17/2023 09:01:17 PM (3 years ago)

Author:

joedolson

Message:

Administration: Apply admin notice functions in multisite.

Use wp_get_admin_notice and wp_admin_notice to handle multisite settings notices.

Props costdev.
See #57791.

File:

• trunk/src/wp-admin/network/themes.php (modified) (6 diffs)

trunk/src/wp-admin/network/themes.php

@@ -368 +368 @@
 
 <?php
+$message = '';
+$type    = 'success';
+
 if ( isset( $_GET['enabled'] ) ) {
         $enabled = absint( $_GET['enabled'] );
@@ -373 +376 @@
                 $message = __( 'Theme enabled.' );
         } else {
-                /* translators: %s: Number of themes. */
-                $message = _n( '%s theme enabled.', '%s themes enabled.', $enabled );
-        }
-        echo '<div id="message" class="notice notice-success is-dismissible"><p>' . sprintf( $message, number_format_i18n( $enabled ) ) . '</p></div>';
+                $message = sprintf(
+                        /* translators: %s: Number of themes. */
+                        _n( '%s theme enabled.', '%s themes enabled.', $enabled ),
+                        number_format_i18n( $enabled )
+                );
+        }
 } elseif ( isset( $_GET['disabled'] ) ) {
         $disabled = absint( $_GET['disabled'] );
@@ -382 +387 @@
                 $message = __( 'Theme disabled.' );
         } else {
-                /* translators: %s: Number of themes. */
-                $message = _n( '%s theme disabled.', '%s themes disabled.', $disabled );
-        }
-        echo '<div id="message" class="notice notice-success is-dismissible"><p>' . sprintf( $message, number_format_i18n( $disabled ) ) . '</p></div>';
+                $message = sprintf(
+                        /* translators: %s: Number of themes. */
+                        _n( '%s theme disabled.', '%s themes disabled.', $disabled ),
+                        number_format_i18n( $disabled )
+                );
+        }
 } elseif ( isset( $_GET['deleted'] ) ) {
         $deleted = absint( $_GET['deleted'] );
@@ -391 +398 @@
                 $message = __( 'Theme deleted.' );
         } else {
-                /* translators: %s: Number of themes. */
-                $message = _n( '%s theme deleted.', '%s themes deleted.', $deleted );
-        }
-        echo '<div id="message" class="notice notice-success is-dismissible"><p>' . sprintf( $message, number_format_i18n( $deleted ) ) . '</p></div>';
+                $message = sprintf(
+                        /* translators: %s: Number of themes. */
+                        _n( '%s theme deleted.', '%s themes deleted.', $deleted ),
+                        number_format_i18n( $deleted )
+                );
+        }
 } elseif ( isset( $_GET['enabled-auto-update'] ) ) {
         $enabled = absint( $_GET['enabled-auto-update'] );
@@ -400 +409 @@
                 $message = __( 'Theme will be auto-updated.' );
         } else {
-                /* translators: %s: Number of themes. */
-                $message = _n( '%s theme will be auto-updated.', '%s themes will be auto-updated.', $enabled );
-        }
-        echo '<div id="message" class="notice notice-success is-dismissible"><p>' . sprintf( $message, number_format_i18n( $enabled ) ) . '</p></div>';
+                $message = sprintf(
+                        /* translators: %s: Number of themes. */
+                        _n( '%s theme will be auto-updated.', '%s themes will be auto-updated.', $enabled ),
+                        number_format_i18n( $enabled )
+                );
+        }
 } elseif ( isset( $_GET['disabled-auto-update'] ) ) {
         $disabled = absint( $_GET['disabled-auto-update'] );
@@ -409 +420 @@
                 $message = __( 'Theme will no longer be auto-updated.' );
         } else {
-                /* translators: %s: Number of themes. */
-                $message = _n( '%s theme will no longer be auto-updated.', '%s themes will no longer be auto-updated.', $disabled );
-        }
-        echo '<div id="message" class="notice notice-success is-dismissible"><p>' . sprintf( $message, number_format_i18n( $disabled ) ) . '</p></div>';
+                $message = sprintf(
+                        /* translators: %s: Number of themes. */
+                        _n( '%s theme will no longer be auto-updated.', '%s themes will no longer be auto-updated.', $disabled ),
+                        number_format_i18n( $disabled )
+                );
+        }
 } elseif ( isset( $_GET['error'] ) && 'none' === $_GET['error'] ) {
-        echo '<div id="message" class="notice notice-error is-dismissible"><p>' . __( 'No theme selected.' ) . '</p></div>';
+        $message = __( 'No theme selected.' );
+        $type    = 'error';
 } elseif ( isset( $_GET['error'] ) && 'main' === $_GET['error'] ) {
-        echo '<div id="message" class="notice notice-error is-dismissible"><p>' . __( 'You cannot delete a theme while it is active on the main site.' ) . '</p></div>';
-}
-
+        $message = __( 'You cannot delete a theme while it is active on the main site.' );
+        $type    = 'error';
+}
+
+if ( '' !== $message ) {
+        wp_admin_notice(
+                $message,
+                array(
+                        'type'        => $type,
+                        'dismissible' => true,
+                        'id'          => 'message',
+                )
+        );
+}
 ?>