Ticket #35926: 35926.1.diff

src/wp-admin/js/customize-controls.js

@@ -1521 +1521 @@
                         settings = $.map( control.params.settings, function( value ) {
                                 return value;
                         });
-                        api.apply( api, settings.concat( function () {
-                                var key;
 
-                                control.settings = {};
-                                for ( key in control.params.settings ) {
-                                        control.settings[ key ] = api( control.params.settings[ key ] );
-                                }
+                        if ( 0 === settings.length ) {
+                                control.embed();
+                        } else {
+                                api.apply( api, settings.concat( function() {
+                                        var key;
 
-                                control.setting = control.settings['default'] || null;
+                                        control.settings = {};
+                                        for ( key in control.params.settings ) {
+                                                control.settings[ key ] = api( control.params.settings[ key ] );
+                                        }
 
-                                control.embed();
-                        }) );
+                                        control.setting = control.settings['default'] || null;
+
+                                        control.embed();
+                                }) );
+                        }
 
                         // After the control is embedded on the page, invoke the "ready" method.
                         control.deferred.embedded.done( function () {

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

@@ -65 +65 @@
         public $setting = 'default';
 
         /**
+         * Capability required to use this control.
+         *
+         * Normally this is empty and the capability is derived from the capabilities
+         * of the associated `$settings`.
+         *
+         * @since 4.5.0
+         * @access public
+         * @var string
+         */
+        public $capability;
+
+        /**
          * @access public
          * @var int
          */
@@ -187 +199 @@
                 $this->instance_number = self::$instance_count;
 
                 // Process settings.
-                if ( empty( $this->settings ) ) {
+                if ( ! isset( $this->settings ) ) {
                         $this->settings = $id;
                 }
 
@@ -196 +208 @@
                         foreach ( $this->settings as $key => $setting ) {
                                 $settings[ $key ] = $this->manager->get_setting( $setting );
                         }
-                } else {
+                } else if ( is_string( $this->settings ) ) {
                         $this->setting = $this->manager->get_setting( $this->settings );
                         $settings['default'] = $this->setting;
                 }
@@ -306 +318 @@
          * @return bool False if theme doesn't support the control or user doesn't have the required permissions, otherwise true.
          */
         final public function check_capabilities() {
+                if ( ! empty( $this->capability ) && ! current_user_can( $this->capability ) ) {
+                        return false;
+                }
+
                 foreach ( $this->settings as $setting ) {
-                        if ( ! $setting->check_capabilities() )
+                        if ( ! $setting->check_capabilities() ) {
                                 return false;
+                        }
                 }
 
                 $section = $this->manager->get_section( $this->section );
-                if ( isset( $section ) && ! $section->check_capabilities() )
+                if ( isset( $section ) && ! $section->check_capabilities() ) {
                         return false;
+                }
 
                 return true;
         }

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

@@ -596 +596 @@
                         'priority' => 999,
                 ) ) );
 
-                $this->manager->add_setting( 'new_menu_name', array(
-                        'type'      => 'new_menu',
-                        'default'   => '',
-                        'transport' => isset( $this->manager->selective_refresh ) ? 'postMessage' : 'refresh',
-                ) );
-
                 $this->manager->add_control( 'new_menu_name', array(
                         'label'       => '',
                         'section'     => 'add_menu',
                         'type'        => 'text',
+                        'settings'    => array(),
                         'input_attrs' => array(
                                 'class'       => 'menu-name-field',
                                 'placeholder' => __( 'New menu name' ),
                         ),
                 ) );
 
-                $this->manager->add_setting( 'create_new_menu', array(
-                        'type' => 'new_menu',
-                ) );
-
                 $this->manager->add_control( new WP_Customize_New_Menu_Control( $this->manager, 'create_new_menu', array(
-                        'section' => 'add_menu',
+                        'section'  => 'add_menu',
+                        'settings' => array(),
                 ) ) );
         }
 
@@ -841 +833 @@
                                         'type'                => 'nav_menu_instance',
                                         'render_callback'     => array( $this, 'render_nav_menu_partial' ),
                                         'container_inclusive' => true,
+                                        'settings'            => array(), // Empty because the nav menu instance may relate to a menu or a location.
+                                        'capability'          => 'edit_theme_options',
                                 )
                         );
                 }

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

@@ -1485 +1485 @@
          */
         public function customize_dynamic_partial_args( $partial_args, $partial_id ) {
 
-                if ( preg_match( '/^widget\[.+\]$/', $partial_id ) ) {
+                if ( preg_match( '/^widget\[(?P<widget_id>.+)\]$/', $partial_id, $matches ) ) {
                         if ( false === $partial_args ) {
                                 $partial_args = array();
                         }
                         $partial_args = array_merge(
                                 $partial_args,
                                 array(
-                                        'type' => 'widget',
-                                        'render_callback' => array( $this, 'render_widget_partial' ),
+                                        'type'                => 'widget',
+                                        'render_callback'     => array( $this, 'render_widget_partial' ),
                                         'container_inclusive' => true,
+                                        'settings'            => array( $this->get_setting_id( $matches['widget_id'] ) ),
+                                        'capability'          => 'edit_theme_options',
                                 )
                         );
                 }

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

@@ -90 +90 @@
         public $primary_setting;
 
         /**
+         * Capability required to edit this partial.
+         *
+         * Normally this is empty and the capability is derived from the capabilities
+         * of the associated `$settings`.
+         *
+         * @since 4.5.0
+         * @access public
+         * @var string
+         */
+        public $capability;
+
+        /**
          * Render callback.
          *
          * @since 4.5.0
@@ -157 +169 @@
                 }
 
                 // Process settings.
-                if ( empty( $this->settings ) ) {
+                if ( ! isset( $this->settings ) ) {
                         $this->settings = array( $id );
                 } else if ( is_string( $this->settings ) ) {
                         $this->settings = array( $this->settings );
@@ -299 +311 @@
          *                    or if one of the associated settings does not exist.
          */
         final public function check_capabilities() {
+                if ( ! empty( $this->capability ) && ! current_user_can( $this->capability ) ) {
+                        return false;
+                }
                 foreach ( $this->settings as $setting_id ) {
                         $setting = $this->component->manager->get_setting( $setting_id );
                         if ( ! $setting || ! $setting->check_capabilities() ) {

tests/qunit/fixtures/customize-menus.js

@@ -394 +394 @@
         'description': '',
         'instanceNumber': 46
 };
-window._wpCustomizeSettings.settings.new_menu_name = {
-        'value': '',
-        'transport': 'postMessage',
-        'dirty': false
-};
 
 // From nav-menu.js
 window.wpNavMenu = {