Changeset 23453

Timestamp:

02/19/2013 01:31:42 AM (12 years ago)

Author:

SergeyBiryukov

Message:

Fix a warning on Menus screen if $menu_locations is false.
Fix menu selection after creating a first menu on new install.

props jkudish.
fixes #23508. see #23119.

File:

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

trunk/wp-admin/nav-menus.php

@@ -265 +265 @@
         $locations = get_registered_nav_menus();
         $menu_locations = get_nav_menu_locations();
+        if ( empty( $menu_locations ) || ! is_array( $menu_locations ) )
+            $menu_locations = array();
 
         // Remove menu locations that have been unchecked
@@ -372 +374 @@
 
 // Set $nav_menu_selected_id to 0 if no menus
-if ( $one_theme_location_no_menus )
+if ( $one_theme_location_no_menus ) {
     $nav_menu_selected_id = 0;
+} elseif ( empty( $nav_menu_selected_id ) && ! empty( $nav_menus ) && ! $add_new_screen ) {
+    // if we have no selection yet, and we have menus, set to the first one in the list
+    $nav_menu_selected_id = $nav_menus[0]->term_id;
+}
 
 // Update the user's setting