diff --git a/src/wp-includes/blocks.php b/src/wp-includes/blocks.php
index 9a552835f7..e9dcdfbf7c 100644
a
|
b
|
function register_block_style_handle( $metadata, $field_name ) { |
158 | 158 | return false; |
159 | 159 | } |
160 | 160 | $is_core_block = isset( $metadata['file'] ) && 0 === strpos( $metadata['file'], ABSPATH . WPINC ); |
161 | | if ( $is_core_block && ! should_load_separate_core_block_assets() ) { |
| 161 | if ( $is_core_block && ! wp_should_load_separate_core_block_assets() ) { |
162 | 162 | return false; |
163 | 163 | } |
164 | 164 | |
diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
index 515622825a..16a5f07d09 100644
a
|
b
|
function wp_default_styles( $styles ) { |
1572 | 1572 | $handle = 'wp-' . $package; |
1573 | 1573 | $path = "/wp-includes/css/dist/$package/style$suffix.css"; |
1574 | 1574 | |
1575 | | if ( 'block-library' === $package && should_load_separate_core_block_assets() ) { |
| 1575 | if ( 'block-library' === $package && wp_should_load_separate_core_block_assets() ) { |
1576 | 1576 | $path = "/wp-includes/css/dist/$package/common$suffix.css"; |
1577 | 1577 | } |
1578 | 1578 | $styles->add( $handle, $path, $dependencies ); |
… |
… |
function wp_should_load_block_editor_scripts_and_styles() { |
2278 | 2278 | * |
2279 | 2279 | * @return bool Whether separate assets will be loaded or not. |
2280 | 2280 | */ |
2281 | | function should_load_separate_core_block_assets() { |
| 2281 | function wp_should_load_separate_core_block_assets() { |
2282 | 2282 | if ( is_admin() || is_feed() || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) ) { |
2283 | 2283 | return false; |
2284 | 2284 | } |
… |
… |
function should_load_separate_core_block_assets() { |
2292 | 2292 | * @param bool $load_separate_assets Whether separate assets will be loaded or not. |
2293 | 2293 | * Default false. |
2294 | 2294 | */ |
2295 | | return apply_filters( 'separate_core_block_assets', false ); |
| 2295 | return apply_filters( 'should_load_separate_core_block_assets', false ); |
2296 | 2296 | } |
2297 | 2297 | |
2298 | 2298 | /** |
… |
… |
function should_load_separate_core_block_assets() { |
2306 | 2306 | function wp_enqueue_registered_block_scripts_and_styles() { |
2307 | 2307 | global $current_screen; |
2308 | 2308 | |
2309 | | if ( should_load_separate_core_block_assets() ) { |
| 2309 | if ( wp_should_load_separate_core_block_assets() ) { |
2310 | 2310 | return; |
2311 | 2311 | } |
2312 | 2312 | |
diff --git a/tests/phpunit/tests/dependencies/styles.php b/tests/phpunit/tests/dependencies/styles.php
index c3b04bbdac..444430719a 100644
a
|
b
|
CSS; |
429 | 429 | * @covers ::wp_default_styles |
430 | 430 | */ |
431 | 431 | function test_block_styles_for_viewing_without_split_styles() { |
432 | | add_filter( 'separate_core_block_assets', '__return_false' ); |
| 432 | add_filter( 'should_load_separate_core_block_assets', '__return_false' ); |
433 | 433 | wp_default_styles( $GLOBALS['wp_styles'] ); |
434 | 434 | |
435 | 435 | $this->assertSame( |
… |
… |
CSS; |
446 | 446 | * @covers ::wp_default_styles |
447 | 447 | */ |
448 | 448 | function test_block_styles_for_viewing_with_split_styles() { |
449 | | add_filter( 'separate_core_block_assets', '__return_true' ); |
| 449 | add_filter( 'should_load_separate_core_block_assets', '__return_true' ); |
450 | 450 | wp_default_styles( $GLOBALS['wp_styles'] ); |
451 | 451 | |
452 | 452 | $this->assertSame( |