From db93447b85cd32a6211b9dd92cdc56f323ef9379 Mon Sep 17 00:00:00 2001 From: Ben Dwyer Date: Mon, 26 Sep 2022 16:45:31 +0100 Subject: [PATCH 1/5] Backport: Gutenberg 4434 --- src/wp-includes/script-loader.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index e8f80d270ff2c..12d4d40a57b40 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -3640,3 +3640,19 @@ function _wp_theme_json_webfonts_handler() { add_action( 'wp_enqueue_scripts', $fn_generate_and_enqueue_styles ); add_action( 'admin_init', $fn_generate_and_enqueue_editor_styles ); } + +/** + * Loads classic theme styles on classic themes. + * + * This is needed for backwards compatibility for button blocks specifically. + */ +function gutenberg_enqueue_classic_theme_styles() { + if ( ! wp_is_block_theme() ) { + wp_register_style( 'classic-theme-styles', "/wp-includes/css/dist/block-library/classic.css", array(), true ); + wp_enqueue_style( 'classic-theme-styles' ); + } +} +// To load classic theme styles on the frontend. +add_action( 'wp_enqueue_scripts', 'gutenberg_enqueue_classic_theme_styles' ); +// To load classic theme styles in the the editor. +add_action( 'admin_enqueue_scripts', 'gutenberg_enqueue_classic_theme_styles' ); From d1cb30949ce100abb2ba1728f91bfc39a33d690a Mon Sep 17 00:00:00 2001 From: Ben Dwyer Date: Mon, 26 Sep 2022 16:45:31 +0100 Subject: [PATCH 2/5] Backport: Gutenberg 4434 --- src/wp-includes/script-loader.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index e8f80d270ff2c..12d4d40a57b40 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -3640,3 +3640,19 @@ function _wp_theme_json_webfonts_handler() { add_action( 'wp_enqueue_scripts', $fn_generate_and_enqueue_styles ); add_action( 'admin_init', $fn_generate_and_enqueue_editor_styles ); } + +/** + * Loads classic theme styles on classic themes. + * + * This is needed for backwards compatibility for button blocks specifically. + */ +function gutenberg_enqueue_classic_theme_styles() { + if ( ! wp_is_block_theme() ) { + wp_register_style( 'classic-theme-styles', "/wp-includes/css/dist/block-library/classic.css", array(), true ); + wp_enqueue_style( 'classic-theme-styles' ); + } +} +// To load classic theme styles on the frontend. +add_action( 'wp_enqueue_scripts', 'gutenberg_enqueue_classic_theme_styles' ); +// To load classic theme styles in the the editor. +add_action( 'admin_enqueue_scripts', 'gutenberg_enqueue_classic_theme_styles' ); From 1938d3c16f414608879a6738f9963d2215d1e8aa Mon Sep 17 00:00:00 2001 From: Ben Dwyer Date: Tue, 27 Sep 2022 19:07:39 +0100 Subject: [PATCH 3/5] Update src/wp-includes/script-loader.php Co-authored-by: Bernie Reiter --- src/wp-includes/script-loader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index 12d4d40a57b40..e48fe261d2d9f 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -3646,7 +3646,7 @@ function _wp_theme_json_webfonts_handler() { * * This is needed for backwards compatibility for button blocks specifically. */ -function gutenberg_enqueue_classic_theme_styles() { +function wp_enqueue_classic_theme_styles() { if ( ! wp_is_block_theme() ) { wp_register_style( 'classic-theme-styles', "/wp-includes/css/dist/block-library/classic.css", array(), true ); wp_enqueue_style( 'classic-theme-styles' ); From e71a7b8adfc6598a8fd64da09b37c28b5a0dcc6f Mon Sep 17 00:00:00 2001 From: Ben Dwyer Date: Tue, 27 Sep 2022 19:07:44 +0100 Subject: [PATCH 4/5] Update src/wp-includes/script-loader.php Co-authored-by: Bernie Reiter --- src/wp-includes/script-loader.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index e48fe261d2d9f..28d9a125af400 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -3653,6 +3653,6 @@ function wp_enqueue_classic_theme_styles() { } } // To load classic theme styles on the frontend. -add_action( 'wp_enqueue_scripts', 'gutenberg_enqueue_classic_theme_styles' ); +add_action( 'wp_enqueue_scripts', 'wp_enqueue_classic_theme_styles' ); // To load classic theme styles in the the editor. -add_action( 'admin_enqueue_scripts', 'gutenberg_enqueue_classic_theme_styles' ); +add_action( 'admin_enqueue_scripts', 'wp_enqueue_classic_theme_styles' ); From 602e1dcb4c3fbb5d2da8aa04576891ca282a6335 Mon Sep 17 00:00:00 2001 From: Ben Dwyer Date: Thu, 29 Sep 2022 07:52:57 +0100 Subject: [PATCH 5/5] add suffix --- src/wp-includes/script-loader.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index 12d4d40a57b40..f788a878e23cd 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -3648,7 +3648,8 @@ function _wp_theme_json_webfonts_handler() { */ function gutenberg_enqueue_classic_theme_styles() { if ( ! wp_is_block_theme() ) { - wp_register_style( 'classic-theme-styles', "/wp-includes/css/dist/block-library/classic.css", array(), true ); + $suffix = wp_scripts_get_suffix(); + wp_register_style( 'classic-theme-styles', "/wp-includes/css/dist/block-library/classic$suffix.css", array(), true ); wp_enqueue_style( 'classic-theme-styles' ); } }