Changeset 50938

Timestamp:

05/20/2021 04:51:16 AM (3 years ago)

Author:

peterwilsoncc

Message:

Menus: Do not auto-set locations for new menus.

Do not auto-set new menus to all vacant locations on the Appearance > Menus screen in the dashboard.

Follow up to [48051].

Props Chouby, audrasjb, davidbaumwald, mukesh27.
Fixes #52949.

File:

• trunk/src/wp-admin/nav-menus.php (modified) (2 diffs)

trunk/src/wp-admin/nav-menus.php

@@ -339 +339 @@
                         wp_save_nav_menu_items( $nav_menu_selected_id, absint( $_REQUEST['menu-item'] ) );
                     }
-
-                    // 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'] ) ) {
@@ -1043 +1034 @@
                                         <?php
                                         foreach ( $locations as $location => $description ) :
-                                            $checked = isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] === $nav_menu_selected_id;
+                                            $checked = false;
+
+                                            if ( isset( $menu_locations[ $location ] )
+                                                    && 0 !== $nav_menu_selected_id
+                                                    && $menu_locations[ $location ] === $nav_menu_selected_id
+                                            ) {
+                                                    $checked = true;
+                                            }
                                             ?>
                                             <div class="menu-settings-input checkbox-input">