Ticket #35926: 35926.0.diff

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

@@ -187 +187 @@
                 $this->instance_number = self::$instance_count;
 
                 // Process settings.
-                if ( empty( $this->settings ) ) {
+                if ( ! isset( $args['settings'] ) ) {
                         $this->settings = $id;
                 }
 
@@ -196 +196 @@
                         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;
                 }

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',
@@ -612 +606 @@
                         ),
                 ) );
 
-                $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',
                 ) ) );

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( $args['settings'] ) ) {
                         $this->settings = array( $id );
                 } else if ( is_string( $this->settings ) ) {
                         $this->settings = array( $this->settings );
@@ -290 +302 @@
          * Checks if the user can refresh this partial.
          *
          * Returns false if the user cannot manipulate one of the associated settings,
-         * or if one of the associated settings does not exist.
+         * or if one of the associated settings does not exist, or if the partial
+         * has an explicit `$capability` which the current user cannot do.
          *
          * @since 4.5.0
          * @access public
@@ -299 +312 @@
          *                    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() ) {