From 138fa081a7f94f3b512602f3df46ee84cf348d12 Mon Sep 17 00:00:00 2001
From: noisysocks <noisysocks@git.wordpress.org>
Date: Wed, 2 Jun 2021 01:57:57 +0000
Subject: [PATCH] Widgets: Add missing actions to widgets block editor

Adds the `'sidebar_admin-setup'`, `'sidebar_admin_page'`, and
`current_theme_supports( 'widgets' )` check to the widgets block editor so that
the block editor screen is more compatible with the classic screen.

Fixes #53288.
Props isabel_brison.

Built from https://develop.svn.wordpress.org/trunk@51061


git-svn-id: http://core.svn.wordpress.org/trunk@50670 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/widgets-form-blocks.php | 6 ++++++
 wp-admin/widgets-form.php        | 4 ----
 wp-admin/widgets.php             | 4 ++++
 wp-includes/version.php          | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/wp-admin/widgets-form-blocks.php b/wp-admin/widgets-form-blocks.php
index 6f209da27f..4af4bd051b 100644
--- a/wp-admin/widgets-form-blocks.php
+++ b/wp-admin/widgets-form-blocks.php
@@ -55,6 +55,9 @@ wp_enqueue_style( 'wp-edit-widgets' );
 /** This action is documented in wp-admin/edit-form-blocks.php */
 do_action( 'enqueue_block_editor_assets' );
 
+/** This action is documented in wp-admin/widgets-form.php */
+do_action( 'sidebar_admin_setup' );
+
 require_once ABSPATH . 'wp-admin/admin-header.php';
 
 /** This action is documented in wp-admin/widgets-form.php */
@@ -64,4 +67,7 @@ do_action( 'widgets_admin_page' );
 <div id="widgets-editor" class="blocks-widgets-container"></div> 
 
 <?php
+/** This action is documented in wp-admin/widgets-form.php */
+do_action( 'sidebar_admin_page' );
+
 require_once ABSPATH . 'wp-admin/admin-footer.php';
diff --git a/wp-admin/widgets-form.php b/wp-admin/widgets-form.php
index af6332e6cb..df4efdba90 100644
--- a/wp-admin/widgets-form.php
+++ b/wp-admin/widgets-form.php
@@ -72,10 +72,6 @@ get_current_screen()->set_help_sidebar(
 	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
 );
 
-if ( ! current_theme_supports( 'widgets' ) ) {
-	wp_die( __( 'The theme you are currently using isn&#8217;t widget-aware, meaning that it has no sidebars that you are able to change. For information on making your theme widget-aware, please <a href="https://developer.wordpress.org/themes/functionality/widgets/">follow these instructions</a>.' ) );
-}
-
 // These are the widgets grouped by sidebar.
 $sidebars_widgets = wp_get_sidebars_widgets();
 
diff --git a/wp-admin/widgets.php b/wp-admin/widgets.php
index 303ebb0bc9..88a58f59ba 100644
--- a/wp-admin/widgets.php
+++ b/wp-admin/widgets.php
@@ -20,6 +20,10 @@ if ( ! current_user_can( 'edit_theme_options' ) ) {
 	);
 }
 
+if ( ! current_theme_supports( 'widgets' ) ) {
+	wp_die( __( 'The theme you are currently using isn&#8217;t widget-aware, meaning that it has no sidebars that you are able to change. For information on making your theme widget-aware, please <a href="https://developer.wordpress.org/themes/functionality/widgets/">follow these instructions</a>.' ) );
+}
+
 $title       = __( 'Widgets' );
 $parent_file = 'themes.php';
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b75cc9346e..d0405b7234 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.8-alpha-51060';
+$wp_version = '5.8-alpha-51061';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.