Ticket #50328: 50328.3.patch

src/wp-includes/blocks.php

@@ -158 +158 @@
                 return false;
         }
         $is_core_block = isset( $metadata['file'] ) && 0 === strpos( $metadata['file'], ABSPATH . WPINC );
-        if ( $is_core_block && ! should_load_separate_core_block_assets() ) {
+        if ( $is_core_block && ! wp_should_load_separate_core_block_assets() ) {
                 return false;
         }
 

src/wp-includes/script-loader.php

@@ -1572 +1572 @@
                 $handle = 'wp-' . $package;
                 $path   = "/wp-includes/css/dist/$package/style$suffix.css";
 
-                if ( 'block-library' === $package && should_load_separate_core_block_assets() ) {
+                if ( 'block-library' === $package && wp_should_load_separate_core_block_assets() ) {
                         $path = "/wp-includes/css/dist/$package/common$suffix.css";
                 }
                 $styles->add( $handle, $path, $dependencies );
@@ -2278 +2278 @@
  *
  * @return bool Whether separate assets will be loaded or not.
  */
-function should_load_separate_core_block_assets() {
+function wp_should_load_separate_core_block_assets() {
         if ( is_admin() || is_feed() || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) ) {
                 return false;
         }
@@ -2292 +2292 @@
          * @param bool $load_separate_assets Whether separate assets will be loaded or not.
          *                                   Default false.
          */
-        return apply_filters( 'separate_core_block_assets', false );
+        return apply_filters( 'should_load_separate_core_block_assets', false );
 }
 
 /**
@@ -2306 +2306 @@
 function wp_enqueue_registered_block_scripts_and_styles() {
         global $current_screen;
 
-        if ( should_load_separate_core_block_assets() ) {
+        if ( wp_should_load_separate_core_block_assets() ) {
                 return;
         }
 

tests/phpunit/tests/dependencies/styles.php

@@ -429 +429 @@
          * @covers ::wp_default_styles
          */
         function test_block_styles_for_viewing_without_split_styles() {
-                add_filter( 'separate_core_block_assets', '__return_false' );
+                add_filter( 'should_load_separate_core_block_assets', '__return_false' );
                 wp_default_styles( $GLOBALS['wp_styles'] );
 
                 $this->assertSame(
@@ -446 +446 @@
          * @covers ::wp_default_styles
          */
         function test_block_styles_for_viewing_with_split_styles() {
-                add_filter( 'separate_core_block_assets', '__return_true' );
+                add_filter( 'should_load_separate_core_block_assets', '__return_true' );
                 wp_default_styles( $GLOBALS['wp_styles'] );
 
                 $this->assertSame(