Ticket #35895: 35895.0.diff

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

@@ -48 +48 @@
                 $this->previewed_menus = array();
                 $this->manager         = $manager;
 
+                // Skip useless hooks when the user can't manage nav menus anyway.
+                if ( ! current_user_can( 'edit_theme_options' ) ) {
+                        return;
+                }
+
                 add_filter( 'customize_refresh_nonces', array( $this, 'filter_nonces' ) );
                 add_action( 'wp_ajax_load-available-menu-items-customizer', array( $this, 'ajax_load_available_items' ) );
                 add_action( 'wp_ajax_search-available-menu-items-customizer', array( $this, 'ajax_search_available_items' ) );

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

@@ -84 +84 @@
         public function __construct( $manager ) {
                 $this->manager = $manager;
 
+                // Skip useless hooks when the user can't manage widgets anyway.
+                if ( ! current_user_can( 'edit_theme_options' ) ) {
+                        return;
+                }
+
                 add_filter( 'customize_dynamic_setting_args',          array( $this, 'filter_customize_dynamic_setting_args' ), 10, 2 );
                 add_action( 'after_setup_theme',                       array( $this, 'register_settings' ) );
                 add_action( 'wp_loaded',                               array( $this, 'override_sidebars_widgets_for_theme_switch' ) );

tests/phpunit/tests/customize/widgets.php

@@ -23 +23 @@
         function setUp() {
                 parent::setUp();
                 require_once( ABSPATH . WPINC . '/class-wp-customize-manager.php' );
+
+                $user_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
+                wp_set_current_user( $user_id );
                 $GLOBALS['wp_customize'] = new WP_Customize_Manager();
                 $this->manager = $GLOBALS['wp_customize'];
 
@@ -41 +44 @@
                 remove_action( 'after_setup_theme', 'twentysixteen_setup' );
                 remove_action( 'customize_register', 'twentysixteen_customize_register', 11 );
 
-                $user_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
-                wp_set_current_user( $user_id );
-
                 $this->backup_registered_sidebars = $GLOBALS['wp_registered_sidebars'];
         }