Changes from branches/3.6/wp-admin/nav-menus.php at r25232 to trunk/wp-admin/nav-menus.php at r24680

File:

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

trunk/wp-admin/nav-menus.php

@@ -301 +301 @@
                                                 wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selected_title );
                                                 // Auto-save nav_menu_locations
-                                                $locations = get_nav_menu_locations();
-                                                foreach ( $locations as $location => $menu_id ) {
+                                                $locations = get_theme_mod( 'nav_menu_locations' );
+                                                foreach ( (array) $locations as $location => $menu_id ) {
                                                                 $locations[ $location ] = $nav_menu_selected_id;
                                                                 break; // There should only be 1
@@ -309 +309 @@
                                         }
                                         if ( isset( $_REQUEST['use-location'] ) ) {
-                                                $locations = get_registered_nav_menus();
-                                                $menu_locations = get_nav_menu_locations();
-                                                if ( isset( $locations[ $_REQUEST['use-location'] ] ) )
-                                                        $menu_locations[ $_REQUEST['use-location'] ] = $nav_menu_selected_id;
-                                                set_theme_mod( 'nav_menu_locations', $menu_locations );
+                                                $locations = get_theme_mod( 'nav_menu_locations' );
+                                                if ( isset( $locations[$_REQUEST['use-location']] ) )
+                                                        $locations[$_REQUEST['use-location']] = $nav_menu_selected_id;
+                                                set_theme_mod( 'nav_menu_locations', $locations );
                                         }
                                         // $messages[] = '<div id="message" class="updated"><p>' . sprintf( __( '<strong>%s</strong> has been created.' ), $nav_menu_selected_title ) . '</p></div>';