Ticket #32672: 32672.2.diff

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

@@ -893 +893 @@
                         // Add/remove menus from the available options when they are added and removed.
                         api.bind( 'add', function( setting ) {
                                 var option, menuId, matches = setting.id.match( navMenuIdRegex );
-                                if ( ! matches || false === setting() ) {
+                                if ( ! matches || 'undefined' === typeof setting().name ) {
                                         return;
                                 }
                                 menuId = matches[1];

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

@@ -420 +420 @@
                         'description' => $description,
                 ) );
 
-                // @todo if ( ! $menus ) : make a "default" menu
-                if ( $menus ) {
-                        $choices = array( '0' => __( '— Select —' ) );
-                        foreach ( $menus as $menu ) {
-                                $choices[ $menu->term_id ] = wp_html_excerpt( $menu->name, 40, '…' );
-                        }
-
-                        foreach ( $locations as $location => $description ) {
-                                $setting_id = "nav_menu_locations[{$location}]";
-
-                                $setting = $this->manager->get_setting( $setting_id );
-                                if ( $setting ) {
-                                        $setting->transport = 'postMessage';
-                                        remove_filter( "customize_sanitize_{$setting_id}", 'absint' );
-                                        add_filter( "customize_sanitize_{$setting_id}", array( $this, 'intval_base10' ) );
-                                } else {
-                                        $this->manager->add_setting( $setting_id, array(
-                                                'sanitize_callback' => array( $this, 'intval_base10' ),
-                                                'theme_supports'    => 'menus',
-                                                'type'              => 'theme_mod',
-                                                'transport'         => 'postMessage',
-                                        ) );
-                                }
+                $choices = array( '0' => __( '— Select —' ) );
+                foreach ( $menus as $menu ) {
+                        $choices[ $menu->term_id ] = wp_html_excerpt( $menu->name, 40, '…' );
+                }
 
-                                $this->manager->add_control( new WP_Customize_Nav_Menu_Location_Control( $this->manager, $setting_id, array(
-                                        'label'       => $description,
-                                        'location_id' => $location,
-                                        'section'     => 'menu_locations',
-                                        'choices'     => $choices,
-                                ) ) );
+                foreach ( $locations as $location => $description ) {
+                        $setting_id = "nav_menu_locations[{$location}]";
+
+                        $setting = $this->manager->get_setting( $setting_id );
+                        if ( $setting ) {
+                                $setting->transport = 'postMessage';
+                                remove_filter( "customize_sanitize_{$setting_id}", 'absint' );
+                                add_filter( "customize_sanitize_{$setting_id}", array( $this, 'intval_base10' ) );
+                        } else {
+                                $this->manager->add_setting( $setting_id, array(
+                                        'sanitize_callback' => array( $this, 'intval_base10' ),
+                                        'theme_supports'    => 'menus',
+                                        'type'              => 'theme_mod',
+                                        'transport'         => 'postMessage',
+                                ) );
                         }
+
+                        $this->manager->add_control( new WP_Customize_Nav_Menu_Location_Control( $this->manager, $setting_id, array(
+                                'label'       => $description,
+                                'location_id' => $location,
+                                'section'     => 'menu_locations',
+                                'choices'     => $choices,
+                        ) ) );
                 }
 
                 // Register each menu as a Customizer section, and add each menu item to each menu.