Ticket #13378: 13378.add.menu.save.diff

wp-admin/js/nav-menu.dev.js

@@ -679 +679 @@
                 },
 
                 eventOnClickMenuSave : function(clickedEl) {
+                        var locs = '';
+                        // Copy menu theme locations
+                        $('#nav-menu-theme-locations select').each(function() {
+                                locs += '<input type="hidden" name="' + this.name + '" value="' + $(this).val() + '" />';
+                        });
+                        $('#update-nav-menu').append( locs );
                         // Update menu item position data
                         api.menuList.find('.menu-item-data-position').val( function(index) { return index + 1; } );
                         return true;

wp-admin/nav-menus.php

@@ -270 +270 @@
         case 'update':
                 check_admin_referer( 'update-nav_menu', 'update-nav-menu-nonce' );
 
+                if ( ! current_theme_supports('nav-menus') && ! current_theme_supports('widgets') )
+                        break;
+
+                // Update menu theme locations
+                set_theme_mod( 'nav_menu_locations', $_POST['menu-locations'] );
+
                 // Add Menu
                 if ( 0 == $nav_menu_selected_id ) {
-                        if ( current_theme_supports('nav-menus') || current_theme_supports('widgets') ) {
-                                $new_menu_title = esc_html( $_POST['menu-name'] );
+                        $new_menu_title = esc_html( $_POST['menu-name'] );
 
-                                if ( $new_menu_title ) {
-                                        $_nav_menu_selected_id = wp_update_nav_menu_object( 0, array('menu-name' => $new_menu_title) );
+                        if ( $new_menu_title ) {
+                                $_nav_menu_selected_id = wp_update_nav_menu_object( 0, array('menu-name' => $new_menu_title) );
 
-                                        if ( is_wp_error( $_nav_menu_selected_id ) ) {
-                                                $messages[] = '<div id="message" class="error"><p>' . $_nav_menu_selected_id->get_error_message() . '</p></div>';
-                                        } else {
-                                                if ( ( $_menu_locations = get_registered_nav_menus() ) && 1 == count( wp_get_nav_menus() ) )
-                                                        set_theme_mod( 'nav_menu_locations', array( key( $_menu_locations ) => $_nav_menu_selected_id ) );
-                                                unset( $_menu_locations );
-                                                $_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
-                                                $nav_menu_selected_id = $_nav_menu_selected_id;
-                                                $nav_menu_selected_title = $_menu_object->name;
-                                                $messages[] = '<div id="message" class="updated"><p>' . sprintf( __('The <strong>%s</strong> menu has been successfully created.'), $nav_menu_selected_title ) . '</p></div>';
-                                        }
+                                if ( is_wp_error( $_nav_menu_selected_id ) ) {
+                                        $messages[] = '<div id="message" class="error"><p>' . $_nav_menu_selected_id->get_error_message() . '</p></div>';
                                 } else {
-                                        $messages[] = '<div id="message" class="error"><p>' . __('Please enter a valid menu name.') . '</p></div>';
+                                        if ( ( $_menu_locations = get_registered_nav_menus() ) && 1 == count( wp_get_nav_menus() ) )
+                                                set_theme_mod( 'nav_menu_locations', array( key( $_menu_locations ) => $_nav_menu_selected_id ) );
+                                        unset( $_menu_locations );
+                                        $_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
+                                        $nav_menu_selected_id = $_nav_menu_selected_id;
+                                        $nav_menu_selected_title = $_menu_object->name;
+                                        $messages[] = '<div id="message" class="updated"><p>' . sprintf( __('The <strong>%s</strong> menu has been successfully created.'), $nav_menu_selected_title ) . '</p></div>';
                                 }
+                        } else {
+                                $messages[] = '<div id="message" class="error"><p>' . __('Please enter a valid menu name.') . '</p></div>';
                         }
 
                 // update existing menu