mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-04-13 08:32:10 +02:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Editor: Rename should_load_separate_core_block_assets for consistency

Browse Source 
Changes introduced:
- The `wp_should_load_separate_core_block_assets` function.
- The `should_load_separate_core_block_assets` filter.

Props hellofromTonya, SergeyBiryukov.
Fixes #50328.



git-svn-id: https://develop.svn.wordpress.org/trunk@50919 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Greg Ziółkowski 2021-05-17 14:26:53 +00:00
parent a8d2e6ba40
commit d9f169a02a
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wp-includes/blocks.php
View File

@ -158,7 +158,7 @@ function register_block_style_handle( $metadata, $field_name ) {
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;
}

8
src/wp-includes/script-loader.php
View File

@ -1572,7 +1572,7 @@ function wp_default_styles( $styles ) {
$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,7 +2278,7 @@ function wp_should_load_block_editor_scripts_and_styles() {
*
* @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,7 +2292,7 @@ function should_load_separate_core_block_assets() {
* @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,7 +2306,7 @@ function should_load_separate_core_block_assets() {
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;
}

4
tests/phpunit/tests/dependencies/styles.php
View File

@ -429,7 +429,7 @@ CSS;
* @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,7 +446,7 @@ CSS;
* @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(