Changeset 49104

Timestamp:

10/08/2020 03:34:31 AM (6 years ago)

Author:

noisysocks

Message:

Tests: Fix dependency tests

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.

File:

• trunk/src/wp-includes/script-loader.php (modified) (3 diffs)

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

@@ -2186 +2186 @@
  */
 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;
         }
@@ -2220 +2220 @@
         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
@@ -2248 +2244 @@
         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();