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

Timestamp:

08/17/2023 09:01:17 PM (23 months 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/settings.php (modified) (2 diffs)

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

@@ -139 +139 @@
 
 if ( isset( $_GET['updated'] ) ) {
-    ?>
-    <div id="message" class="notice notice-success is-dismissible"><p><?php _e( 'Settings saved.' ); ?></p></div>
-    <?php
+    wp_admin_notice(
+        __( 'Settings saved.' ),
+        array(
+            'type'        => 'success',
+            'dismissible' => true,
+            'id'          => 'message',
+        )
+    );
 }
 ?>
@@ -168 +173 @@
                     $new_admin_email = get_site_option( 'new_admin_email' );
                     if ( $new_admin_email && get_site_option( 'admin_email' ) !== $new_admin_email ) :
-                        ?>
-                        <div class="notice notice-warning is-dismissible inline">
-                        <p>
-                        <?php
-                            printf(
-                                /* translators: %s: New network admin email. */
-                                __( 'There is a pending change of the network admin email to %s.' ),
-                                '<code>' . esc_html( $new_admin_email ) . '</code>'
-                            );
-                            printf(
-                                ' <a href="%1$s">%2$s</a>',
-                                esc_url( wp_nonce_url( network_admin_url( 'settings.php?dismiss=new_network_admin_email' ), 'dismiss_new_network_admin_email' ) ),
-                                __( 'Cancel' )
-                            );
-                        ?>
-                        </p>
-                        </div>
-                    <?php endif; ?>
+                        $notice_message = sprintf(
+                            /* translators: %s: New network admin email. */
+                            __( 'There is a pending change of the network admin email to %s.' ),
+                            '<code>' . esc_html( $new_admin_email ) . '</code>'
+                        );
+
+                        $notice_message .= sprintf(
+                            ' <a href="%1$s">%2$s</a>',
+                            esc_url( wp_nonce_url( network_admin_url( 'settings.php?dismiss=new_network_admin_email' ), 'dismiss_new_network_admin_email' ) ),
+                            __( 'Cancel' )
+                        );
+
+                        wp_admin_notice(
+                            $notice_message,
+                            array(
+                                'type'               => 'warning',
+                                'dismissible'        => true,
+                                'additional_classes' => array( 'inline' ),
+                            )
+                        );
+                    endif;
+                    ?>
                 </td>
             </tr>