Ticket #57791: 57791-nav-menus.diff

src/wp-admin/includes/nav-menu.php

@@ -1291 +1291 @@
                 }
 
                 if ( $some_pending_menu_items ) {
-                        $result .= '<div class="notice notice-info notice-alt inline"><p>'
-                                . __( 'Click Save Menu to make pending menu items public.' )
-                                . '</p></div>';
+                        $message     = __( 'Click Save Menu to make pending menu items public.' );
+                        $notice_args = array(
+                                'type'               => 'info',
+                                'additional_classes' => array( 'notice-alt', 'inline' ),
+                        );
+                        $result     .= wp_get_admin_notice( $message, $notice_args );
                 }
 
                 if ( $some_invalid_menu_items ) {
-                        $result .= '<div class="notice notice-error notice-alt inline"><p>'
-                                . __( 'There are some invalid menu items. Please check or delete them.' )
-                                . '</p></div>';
+                        $message     = __( 'There are some invalid menu items. Please check or delete them.' );
+                        $notice_args = array(
+                                'type'               => 'error',
+                                'additional_classes' => array( 'notice-alt', 'inline' ),
+                        );
+                        $result     .= wp_get_admin_notice( $message, $notice_args );
                 }
 
                 $result .= '<ul class="menu" id="menu-to-edit"> ';
@@ -1480 +1486 @@
         /** This action is documented in wp-includes/nav-menu.php */
         do_action( 'wp_update_nav_menu', $nav_menu_selected_id );
 
-        $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' .
-                sprintf(
-                        /* translators: %s: Nav menu title. */
-                        __( '%s has been updated.' ),
-                        '<strong>' . $nav_menu_selected_title . '</strong>'
-                ) . '</p></div>';
+        /* translators: %s: Nav menu title. */
+        $message     = sprintf( __( '%s has been updated.' ), '<strong>' .  $nav_menu_selected_title . '</strong>' );
+        $notice_args = array(
+                'id'                 => 'message',
+                'dismissible'        => true,
+                'additional_classes' => array( 'updated' ),
+        );
 
+        $messages[] = wp_get_admin_notice( $message, $notice_args );
+
         unset( $menu_items, $unsorted_menu_items );
 
         return $messages;