Changeset 33094

Timestamp:

07/06/2015 07:12:48 PM (9 years ago)

Author:

westonruter

Message:

Customizer: Register controls and settings for nav_menu_locations even when there are no menus yet.

This change ensures that the first menu created can be assigned to a location without first saving and reloading the Customizer.

Props markoheijnen.
Fixes #32858.

Location:

trunk/src

Files:

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

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

@@ -2546 +2546 @@
      */
     function displayNavMenuName( name ) {
+        name = name || '';
         name = $( '<div>' ).text( name ).html(); // Emulate esc_html() which is used in wp-admin/nav-menus.php.
         name = $.trim( name );

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

@@ -434 +434 @@
         ) );
 
-        // @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, '…' );
+        $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',
+                ) );
             }
 
-            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,
-                ) ) );
-            }
+            $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,
+            ) ) );
         }