Changeset 50837

Timestamp:

05/11/2021 02:14:15 PM (4 years ago)

Author:

gziolo

Message:

Editor: Fix regression introduced with loading separate block assets

Related to [50836]. load-styles.php doesn't load the should_load_separate_core_block_assets function and that causes an error 500 - which in turn makes the dashboard appear unstyled.

Props aristath.
Fixes #53180.

Location:

trunk/src/wp-includes

Files:

• blocks.php (modified) (1 diff)
• script-loader.php (modified) (2 diffs)

trunk/src/wp-includes/blocks.php

@@ -953 +953 @@
     return true === $block_support || is_array( $block_support );
 }
-
-/**
- * Checks whether separate assets should be loaded for core blocks.
- *
- * @since 5.8
- *
- * @return bool
- */
-function should_load_separate_core_block_assets() {
-    if ( is_admin() || is_feed() || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) ) {
-        return false;
-    }
-    /**
-     * Determine if separate styles & scripts will be loaded for blocks on-render or not.
-     *
-     * @since 5.8.0
-     *
-     * @param bool $load_separate_styles Whether separate styles will be loaded or not.
-     *
-     * @return bool Whether separate styles will be loaded or not.
-     */
-    return apply_filters( 'separate_core_block_assets', false );
-}

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

@@ -1366 +1366 @@
 
 /**
+ * Checks whether separate assets should be loaded for core blocks.
+ *
+ * @since 5.8
+ *
+ * @return bool
+ */
+function should_load_separate_core_block_assets() {
+    if ( is_admin() || is_feed() || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) ) {
+        return false;
+    }
+    /**
+     * Determine if separate styles & scripts will be loaded for blocks on-render or not.
+     *
+     * @since 5.8.0
+     *
+     * @param bool $load_separate_styles Whether separate styles will be loaded or not.
+     *
+     * @return bool Whether separate styles will be loaded or not.
+     */
+    return apply_filters( 'separate_core_block_assets', false );
+}
+
+/**
  * Assign default styles to $styles object.
  *
@@ -1502 +1525 @@
     }
     $styles->add( 'wp-editor-font', $fonts_url ); // No longer used in core as of 5.7.
-
-    $block_library_theme_path = "/wp-includes/css/dist/block-library/theme$suffix.css";
-    $styles->add( 'wp-block-library-theme', $block_library_theme_path );
+    $block_library_theme_path = WPINC . "/css/dist/block-library/theme$suffix.css";
+    $styles->add( 'wp-block-library-theme', "/$block_library_theme_path" );
     $styles->add_data( 'wp-block-library-theme', 'path', ABSPATH . $block_library_theme_path );