Changeset 42025

Timestamp:

10/25/2017 09:44:48 PM (3 years ago)

Author:

westonruter

Message:

Customize: Register the Publish Settings section in JS to ensure it does not get unregistered via PHP.

The publish_settings section is a fundamental dependency for Customizer, so it must be guaranteed to be registered.

Also unconditionally register core types for panels, sections, and controls in case plugin unhooks all customize_register actions.

See #39896.
Fixes #42337.

Location:

trunk/src

Files:

• wp-admin/js/customize-controls.js (modified) (1 diff)
• wp-includes/class-wp-customize-manager.php (modified) (2 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

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

@@ -7001 +7001 @@
             publishSettingsBtn = $( '#publish-settings' ),
             footerActions = $( '#customize-footer-actions' );
+
+        // Add publish settings section in JS instead of PHP since the Customizer depends on it to function.
+        api.bind( 'ready', function() {
+            api.section.add( new api.OuterSection( 'publish_settings', {
+                title: api.l10n.publishSettings,
+                priority: 0,
+                active: api.settings.theme.active
+            } ) );
+        } );
 
         // Set up publish settings section and its controls.

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -891 +891 @@
      */
     public function wp_loaded() {
+
+        // Unconditionally register core types for panels, sections, and controls in case plugin unhooks all customize_register actions.
+        $this->register_panel_type( 'WP_Customize_Panel' );
+        $this->register_panel_type( 'WP_Customize_Themes_Panel' );
+        $this->register_section_type( 'WP_Customize_Section' );
+        $this->register_section_type( 'WP_Customize_Sidebar_Section' );
+        $this->register_section_type( 'WP_Customize_Themes_Section' );
+        $this->register_control_type( 'WP_Customize_Color_Control' );
+        $this->register_control_type( 'WP_Customize_Media_Control' );
+        $this->register_control_type( 'WP_Customize_Upload_Control' );
+        $this->register_control_type( 'WP_Customize_Image_Control' );
+        $this->register_control_type( 'WP_Customize_Background_Image_Control' );
+        $this->register_control_type( 'WP_Customize_Background_Position_Control' );
+        $this->register_control_type( 'WP_Customize_Cropped_Image_Control' );
+        $this->register_control_type( 'WP_Customize_Site_Icon_Control' );
+        $this->register_control_type( 'WP_Customize_Theme_Control' );
+        $this->register_control_type( 'WP_Customize_Code_Editor_Control' );
+        $this->register_control_type( 'WP_Customize_Date_Time_Control' );
 
         /**
@@ -4727 +4745 @@
     public function register_controls() {
 
-        /* Panel, Section, and Control Types */
-        $this->register_panel_type( 'WP_Customize_Panel' );
-        $this->register_panel_type( 'WP_Customize_Themes_Panel' );
-        $this->register_section_type( 'WP_Customize_Section' );
-        $this->register_section_type( 'WP_Customize_Sidebar_Section' );
-        $this->register_section_type( 'WP_Customize_Themes_Section' );
-        $this->register_control_type( 'WP_Customize_Color_Control' );
-        $this->register_control_type( 'WP_Customize_Media_Control' );
-        $this->register_control_type( 'WP_Customize_Upload_Control' );
-        $this->register_control_type( 'WP_Customize_Image_Control' );
-        $this->register_control_type( 'WP_Customize_Background_Image_Control' );
-        $this->register_control_type( 'WP_Customize_Background_Position_Control' );
-        $this->register_control_type( 'WP_Customize_Cropped_Image_Control' );
-        $this->register_control_type( 'WP_Customize_Site_Icon_Control' );
-        $this->register_control_type( 'WP_Customize_Theme_Control' );
-        $this->register_control_type( 'WP_Customize_Code_Editor_Control' );
-        $this->register_control_type( 'WP_Customize_Date_Time_Control' );
-
-        /* Publish Settings */
-
-        // Note the controls for this section are added via JS.
-        $this->add_section( 'publish_settings', array(
-            'title' => __( 'Publish Settings' ),
-            'priority' => 0,
-            'capability' => 'customize',
-            'type' => 'outer',
-            'active_callback' => array( $this, 'is_theme_active' ),
-        ) );
-
         /* Themes (controls are loaded via ajax) */
 

trunk/src/wp-includes/script-loader.php

@@ -599 +599 @@
             esc_url( admin_url( 'theme-install.php' ) )
         ),
+        'publishSettings' => __( 'Publish Settings' ),
     ) );
     $scripts->add( 'customize-selective-refresh', "/wp-includes/js/customize-selective-refresh$suffix.js", array( 'jquery', 'wp-util', 'customize-preview' ), false, 1 );