Ticket #32760: 32760.diff

src/wp-admin/js/customize-nav-menus.js

@@ -706 +706 @@
                 },
 
                 populateControls: function() {
-                        var section = this, menuNameControlId, menuControl, menuNameControl;
+                        var section = this, setting, menuNameControlId, menuControl, menuNameControl;
+
+                        // Ensure menu name is always populated.
+                        setting = api( section.id );
+                        setting.validate = function( menu ) {
+                                if ( menu && ! menu.name ) {
+                                        menu.name = api.Menus.data.l10n.unnamed;
+                                }
+                                return menu;
+                        };
+                        setting.set( setting.validate( setting.get() ) );
 
                         // Add the control for managing the menu name.
                         menuNameControlId = section.id + '[name]';
@@ -2206 +2216 @@
                                 {},
                                 api.Menus.data.defaultSettingValues.nav_menu,
                                 {
-                                        name: name
+                                        name: name || api.Menus.data.l10n.unnamed
                                 }
                         ) );
 
@@ -2219 +2229 @@
                                 params: {
                                         id: customizeId,
                                         panel: 'nav_menus',
-                                        title: name,
+                                        title: api( customizeId ).get().name,
                                         customizeAction: api.Menus.data.l10n.customizingMenus,
                                         type: 'nav_menu',
                                         priority: 10,
@@ -2299 +2309 @@
                 var insertedMenuIdMapping = {};
 
                 _( data.nav_menu_updates ).each(function( update ) {
-                        var oldCustomizeId, newCustomizeId, oldSetting, newSetting, settingValue, oldSection, newSection;
+                        var oldCustomizeId, newCustomizeId, customizeId, oldSetting, newSetting, setting, settingValue, oldSection, newSection, wasSaved;
                         if ( 'inserted' === update.status ) {
                                 if ( ! update.previous_term_id ) {
                                         throw new Error( 'Expected previous_term_id' );
@@ -2321 +2331 @@
                                 if ( ! settingValue ) {
                                         throw new Error( 'Did not expect setting to be empty (deleted).' );
                                 }
-                                settingValue = _.clone( settingValue );
+                                settingValue = $.extend( _.clone( settingValue ), update.saved_value );
 
                                 insertedMenuIdMapping[ update.previous_term_id ] = update.term_id;
                                 newCustomizeId = 'nav_menu[' + String( update.term_id ) + ']';
@@ -2379 +2389 @@
                                 }
 
                                 // @todo Update the Custom Menu selects, ensuring the newly-inserted IDs are used for any that have selected a placeholder menu.
+                        } else if ( 'updated' === update.status ) {
+                                customizeId = 'nav_menu[' + String( update.term_id ) + ']';
+                                if ( ! api.has( customizeId ) ) {
+                                        throw new Error( 'Expected setting to exist: ' + customizeId );
+                                }
+
+                                // Make sure the setting gets updated with its sanitized server value (specifically the conflict-resolved name).
+                                setting = api( customizeId );
+                                if ( ! _.isEqual( update.saved_value, setting.get() ) ) {
+                                        wasSaved = api.state( 'saved' ).get();
+                                        setting.set( update.saved_value );
+                                        setting._dirty = false;
+                                        api.state( 'saved' ).set( wasSaved );
+                                }
                         }
                 } );
 

src/wp-includes/class-wp-customize-nav-menus.php

@@ -281 +281 @@
                         'itemTypes'            => $this->available_item_types(),
                         'l10n'                 => array(
                                 'untitled'          => _x( '(no label)', 'missing menu item navigation label' ),
+                                'unnamed'           => _x( '(unnamed)', 'Missing menu name.' ),
                                 'custom_label'      => __( 'Custom Link' ),
                                 /* translators: %s: Current menu location */
                                 'menuLocation'      => __( '(Currently set to: %s)' ),

src/wp-includes/class-wp-customize-setting.php

@@ -1182 +1182 @@
                                 if ( false === $nav_menu_setting->save() ) {
                                         $this->update_status = 'error';
                                         $this->update_error  = new WP_Error( 'nav_menu_setting_failure' );
+                                        return;
                                 }
 
                                 if ( $nav_menu_setting->previous_term_id !== intval( $value['nav_menu_term_id'] ) ) {
@@ -1207 +1208 @@
                                 if ( false === $parent_nav_menu_item_setting->save() ) {
                                         $this->update_status = 'error';
                                         $this->update_error  = new WP_Error( 'nav_menu_item_setting_failure' );
+                                        return;
                                 }
 
                                 if ( $parent_nav_menu_item_setting->previous_post_id !== intval( $value['menu_item_parent'] ) ) {
@@ -1606 +1608 @@
                 $value = array_merge( $default, $value );
                 $value = wp_array_slice_assoc( $value, array_keys( $default ) );
 
+                if ( '' === $value['name'] ) {
+                        $value['name'] = _x( '(unnamed)', 'Missing menu name.' );
+                }
+
                 $value['name']        = trim( esc_html( $value['name'] ) ); // This sanitization code is used in wp-admin/nav-menus.php.
                 $value['description'] = sanitize_text_field( $value['description'] );
                 $value['parent']      = max( 0, intval( $value['parent'] ) );
@@ -1673 +1679 @@
                                 $menu_data['menu-name'] = $value['name'];
                         }
 
-                        $r = wp_update_nav_menu_object( $is_placeholder ? 0 : $this->term_id, $menu_data );
+                        $menu_id = $is_placeholder ? 0 : $this->term_id;
+                        $r = wp_update_nav_menu_object( $menu_id, $menu_data );
+                        $original_name = $menu_data['menu-name'];
+                        $name_conflict_suffix = 1;
+                        while ( is_wp_error( $r ) && 'menu_exists' === $r->get_error_code() ) {
+                                $name_conflict_suffix += 1;
+                                $menu_data['menu-name'] = sprintf( __( '%1$s (%2$d)' ), $original_name, $name_conflict_suffix );
+                                $r = wp_update_nav_menu_object( $menu_id, $menu_data );
+                        }
+
                         if ( is_wp_error( $r ) ) {
                                 $this->update_status = 'error';
                                 $this->update_error  = $r;
@@ -1764 +1779 @@
                         'previous_term_id' => $this->previous_term_id,
                         'error'            => $this->update_error ? $this->update_error->get_error_code() : null,
                         'status'           => $this->update_status,
+                        'saved_value'      => $this->value(),
                 );
 
                 return $data;