Changeset 39558

Timestamp:

12/10/2016 06:29:12 AM (8 years ago)

Author:

westonruter

Message:

Customize: Fix inability to delete nav menus by preventing preview filters from being added during customize_save admin ajax request.

Also prevent setting nav_menu_locations[...] values to NaN which gets sent as null.

Amends [38810].
See #30937.
Fixes #39103.

Location:

trunk/src

Files:

• wp-admin/js/customize-nav-menus.js (modified) (1 diff)
• wp-includes/class-wp-customize-nav-menus.php (modified) (2 diffs)

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

@@ -1178 +1178 @@
             // @todo It would be better if this was added directly on the setting itself, as opposed to the control.
             control.setting.validate = function( value ) {
-                return parseInt( value, 10 );
+                if ( '' === value ) {
+                    return 0;
+                } else {
+                    return parseInt( value, 10 );
+                }
             };
 

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

@@ -532 +532 @@
     public function customize_register() {
 
-        /*
-         * Preview settings for nav menus early so that the sections and controls will be added properly.
-         * See https://github.com/xwp/wp-customize-snapshots/blob/962586659688a5b1fd9ae93618b7ce2d4e7a421c/php/class-customize-snapshot-manager.php#L506-L543
-         */
+        // Preview settings for nav menus early so that the sections and controls will be added properly.
         $nav_menus_setting_ids = array();
         foreach ( array_keys( $this->manager->unsanitized_post_values() ) as $setting_id ) {
@@ -543 +540 @@
         }
         $this->manager->add_dynamic_settings( $nav_menus_setting_ids );
-        foreach ( $nav_menus_setting_ids as $setting_id ) {
-            $setting = $this->manager->get_setting( $setting_id );
-            if ( $setting ) {
-                $setting->preview();
+        if ( ! $this->manager->doing_ajax( 'customize_save' ) ) {
+            foreach ( $nav_menus_setting_ids as $setting_id ) {
+                $setting = $this->manager->get_setting( $setting_id );
+                if ( $setting ) {
+                    $setting->preview();
+                }
             }
         }