Skip to content

Backport: Gutenberg 4434 #3331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
scruffian wants to merge 6 commits into from
Closed

Backport: Gutenberg 4434 #3331

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
db93447
Backport: Gutenberg 4434
scruffian Sep 26, 2022
d1cb309
Backport: Gutenberg 4434
scruffian Sep 26, 2022
1938d3c
Update src/wp-includes/script-loader.php
scruffian Sep 27, 2022
e71a7b8
Update src/wp-includes/script-loader.php
scruffian Sep 27, 2022
602e1dc
add suffix
scruffian Sep 29, 2022
dabff79
Merge branch 'backport/gutenberg-44334' of github.com:scruffian/wordp…
scruffian Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions src/wp-includes/script-loader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3640,3 +3640,20 @@ 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 wp_enqueue_classic_theme_styles() {
if ( ! wp_is_block_theme() ) {
$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' );
}
}
// To load classic theme styles on the frontend.
add_action( 'wp_enqueue_scripts', 'wp_enqueue_classic_theme_styles' );
// To load classic theme styles in the the editor.
add_action( 'admin_enqueue_scripts', 'wp_enqueue_classic_theme_styles' );
Comment on lines +3656 to +3659
Copy link
Contributor

@dream-encode dream-encode Sep 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think these should probably be moved to wp-includes/default-filters.php where all other core hooks live. Probably around https://github.com/WordPress/wordpress-develop/blob/trunk/src/wp-includes/default-filters.php#L558

Copy link
Contributor

@dream-encode dream-encode Sep 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll handle this in the merge though.

Copy link
Contributor

@ockham ockham Sep 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @dream-encode!