Changeset 50919

Timestamp:

05/17/2021 02:26:53 PM (3 years ago)

Author:

gziolo

Message:

Editor: Rename should_load_separate_core_block_assets for consistency

Changes introduced:

• The wp_should_load_separate_core_block_assets function.
• The should_load_separate_core_block_assets filter.

Props hellofromTonya, SergeyBiryukov.
Fixes #50328.

Location:

trunk

Files:

• src/wp-includes/blocks.php (modified) (1 diff)
• src/wp-includes/script-loader.php (modified) (4 diffs)
• tests/phpunit/tests/dependencies/styles.php (modified) (2 diffs)

trunk/src/wp-includes/blocks.php

@@ -159 +159 @@
     }
     $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;
     }

trunk/src/wp-includes/script-loader.php

@@ -1573 +1573 @@
         $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";
         }
@@ -2279 +2279 @@
  * @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;
@@ -2293 +2293 @@
      *                                   Default false.
      */
-    return apply_filters( 'separate_core_block_assets', false );
+    return apply_filters( 'should_load_separate_core_block_assets', false );
 }
 
@@ -2307 +2307 @@
     global $current_screen;
 
-    if ( should_load_separate_core_block_assets() ) {
+    if ( wp_should_load_separate_core_block_assets() ) {
         return;
     }

trunk/tests/phpunit/tests/dependencies/styles.php

@@ -430 +430 @@
      */
     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'] );
 
@@ -447 +447 @@
      */
     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'] );