Ticket #44286: 44286.patch

src/wp-admin/css/nav-menus.css

@@ -65 +65 @@
         position: relative;
 }
 
-.blank-slate .menu-settings {
-        border: none;
-        margin-top: 0;
-        padding-top: 0;
-        overflow: hidden;
-}
-
 .is-submenu {
         color: #555d66; /* #fafafa background */
         font-style: italic;
@@ -741 +734 @@
         float: right;
 }
 
-.nav-menus-php .blank-slate .menu-settings {
-        display: none;
-}
-
 /* Same as the Publish Meta Box #delete-action */
 .nav-menus-php .delete-action {
         float: left;

src/wp-admin/nav-menus.php

@@ -324 +324 @@
                                         if ( isset( $_REQUEST['menu-item'] ) ) {
                                                 wp_save_nav_menu_items( $nav_menu_selected_id, absint( $_REQUEST['menu-item'] ) );
                                         }
-                                        if ( isset( $_REQUEST['zero-menu-state'] ) ) {
+                                        // Set the menu_location value correctly for the newly created menu
+                                        foreach ( $menu_locations as $location => $id ) {
+                                                if ( 0 === $id ) {
+                                                        $menu_locations[ $location ] = $nav_menu_selected_id;
+                                                }
+                                        }
+                                        set_theme_mod( 'nav_menu_locations', $menu_locations );
+                                        if ( isset( $_REQUEST['zero-menu-state'] ) || ! empty( $_POST['auto-add-pages'] ) ) {
                                                 // If there are menu items, add them
                                                 wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selected_title );
+                                        }
+                                        if ( isset( $_REQUEST['zero-menu-state'] ) ) {
                                                 // Auto-save nav_menu_locations
                                                 $locations = get_nav_menu_locations();
                                                 foreach ( $locations as $location => $menu_id ) {
@@ -853 +862 @@
         <div id="menu-management-liquid">
                 <div id="menu-management">
                         <form id="update-nav-menu" method="post" enctype="multipart/form-data">
-                        <?php
-                                $new_screen_class = '';
-                        if ( $add_new_screen ) {
-                                $new_screen_class = 'blank-slate';
-                        }
-                        ?>
                                 <h2><?php _e( 'Menu structure' ); ?></h2>
-                                <div class="menu-edit <?php echo $new_screen_class; ?>">
+                                <div class="menu-edit">
                                         <input type="hidden" name="nav-menu-data">
                                         <?php
                                         wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );