mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-02-13 03:04:42 +01:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Tests: Fix dependency tests

Browse Source 
Fixes test_block_styles_for_editing_with_theme_support and
test_block_styles_for_viewing_with_theme_support by partially reverting [49102]
and only calling wp_should_load_block_editor_scripts_and_styles() when on an
admin screen.

Props TimothyBlynJacobs.
See #51330.


git-svn-id: https://develop.svn.wordpress.org/trunk@49104 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Robert Anderson 2020-10-08 03:34:31 +00:00
parent 5b6f5f9f6d
commit cf8c11c2f3
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2185,7 +2185,7 @@ function script_concat_settings() {
* @global WP_Screen $current_screen WordPress current screen object.
*/
function wp_common_block_scripts_and_styles() {
if ( ! wp_should_load_block_editor_scripts_and_styles() ) {
if ( is_admin() && ! wp_should_load_block_editor_scripts_and_styles() ) {
return;
}
@ -2219,15 +2219,11 @@ function wp_common_block_scripts_and_styles() {
function wp_should_load_block_editor_scripts_and_styles() {
global $current_screen;
if ( ! is_admin() ) {
return false;
}
$is_block_editor_screen = ( $current_screen instanceof WP_Screen ) && $current_screen->is_block_editor();
/**
* Filters the flag that decides whether or not block editor scripts and
* styles are going to be enqueued on the current admin screen.
* styles are going to be enqueued on the current screen.
*
* @since 5.6.0
*
@ -2247,7 +2243,7 @@ function wp_should_load_block_editor_scripts_and_styles() {
function wp_enqueue_registered_block_scripts_and_styles() {
global $current_screen;
$load_editor_scripts = wp_should_load_block_editor_scripts_and_styles();
$load_editor_scripts = is_admin() && wp_should_load_block_editor_scripts_and_styles();
$block_registry = WP_Block_Type_Registry::get_instance();
foreach ( $block_registry->get_all_registered() as $block_name => $block_type ) {