diff --git a/lib/global-styles.php b/lib/global-styles.php index 0dc76e7776acc4..14451ee9662653 100644 --- a/lib/global-styles.php +++ b/lib/global-styles.php @@ -481,20 +481,6 @@ function gutenberg_experimental_global_styles_enqueue_assets() { wp_enqueue_style( 'global-styles' ); } -/** - * Whether the loaded page is the site editor. - * - * @return boolean Whether the loaded page is the site editor. - */ -function gutenberg_experimental_global_styles_is_site_editor() { - if ( ! function_exists( 'get_current_screen' ) ) { - return false; - } - - $screen = get_current_screen(); - return ! empty( $screen ) && gutenberg_is_edit_site_page( $screen->id ); -} - /** * Adds the necessary data for the Global Styles client UI to the block settings. * @@ -502,10 +488,7 @@ function gutenberg_experimental_global_styles_is_site_editor() { * @return array New block editor settings */ function gutenberg_experimental_global_styles_settings( $settings ) { - if ( - ! gutenberg_experimental_global_styles_has_theme_json_support() || - ! gutenberg_experimental_global_styles_is_site_editor() - ) { + if ( ! gutenberg_experimental_global_styles_has_theme_json_support() ) { return $settings; } @@ -559,8 +542,6 @@ function gutenberg_experimental_global_styles_register_cpt() { register_post_type( 'wp_global_styles', $args ); } -if ( gutenberg_is_experiment_enabled( 'gutenberg-full-site-editing' ) ) { - add_action( 'init', 'gutenberg_experimental_global_styles_register_cpt' ); - add_filter( 'block_editor_settings', 'gutenberg_experimental_global_styles_settings' ); - add_action( 'wp_enqueue_scripts', 'gutenberg_experimental_global_styles_enqueue_assets' ); -} +add_action( 'init', 'gutenberg_experimental_global_styles_register_cpt' ); +add_filter( 'block_editor_settings', 'gutenberg_experimental_global_styles_settings' ); +add_action( 'wp_enqueue_scripts', 'gutenberg_experimental_global_styles_enqueue_assets' );