Changeset 51214

Timestamp:

06/23/2021 01:07:27 AM (3 years ago)

Author:

desrosj

Message:

Widgets: Add support for the Widgets Editor on after_setup_theme instead of widgets_init.

This better aligns with developer expectations, as add_theme_support() and remove_theme_support() are meant to be called within functions attached to the after_setup_theme hook.

This also adds the widgets-block-editor feature to the docblock for add_theme_support().

Props kevin940726, caseymilne, jamesros161, noisysocks, Mamaduka, audrasjb, zieladam, hellofromTonya, desrosj.
Fixes #53424.

Location:

trunk/src/wp-includes

Files:

• default-filters.php (modified) (1 diff)
• theme.php (modified) (2 diffs)
• widgets.php (modified) (2 diffs)

trunk/src/wp-includes/default-filters.php

@@ -598 +598 @@
 
 // Widgets.
+add_action( 'after_setup_theme', 'wp_setup_widgets_block_editor', 1 );
 add_action( 'init', 'wp_widgets_init', 1 );
 

trunk/src/wp-includes/theme.php

@@ -2480 +2480 @@
  * @since 5.5.0 The `custom-logo` feature now also accepts 'unlink-homepage-logo'.
  * @since 5.6.0 The `post-formats` feature warns if no array is passed.
+ * @since 5.8.0 The `widgets-block-editor` enables the Widgets block editor.
  *
  * @global array $_wp_theme_features
@@ -2512 +2513 @@
  *                          - 'wp-block-styles'
  *                          - 'widgets'
+ *                          - 'widgets-block-editor'
  * @param mixed  ...$args Optional extra arguments to pass along with certain features.
  * @return void|false Void on success, false on failure.

trunk/src/wp-includes/widgets.php

@@ -1802 +1802 @@
     register_widget( 'WP_Widget_Block' );
 
-    add_theme_support( 'widgets-block-editor' );
-
     /**
      * Fires after all default WordPress widgets have been registered.
@@ -1810 +1808 @@
      */
     do_action( 'widgets_init' );
+}
+
+/**
+ * Enables the widgets block editor. This is hooked into 'after_setup_theme' so
+ * that the block editor is enabled by default but can be disabled by themes.
+ *
+ * @since 5.8.0
+ *
+ * @access private
+ */
+function wp_setup_widgets_block_editor() {
+    add_theme_support( 'widgets-block-editor' );
 }