Changeset 58710 for trunk/src/wp-includes/global-styles-and-settings.php

Timestamp:

07/12/2024 07:24:12 PM (2 months ago)

Author:

joemcgill

Message:

Editor: Revert caching of global styles for blocks.

This reverts [58334] to fix a bug where edits to block styles made in the site editor were not showing in the front end.

Props joemcgill, spacedmonkey, andrewserong, hellofromtonya, audrasjb.
See #59595.

File:

• trunk/src/wp-includes/global-styles-and-settings.php (modified) (2 diffs)

trunk/src/wp-includes/global-styles-and-settings.php

@@ -256 +256 @@
     $tree        = WP_Theme_JSON_Resolver::get_merged_data();
     $block_nodes = $tree->get_styles_block_nodes();
-
-    $can_use_cached = ! wp_is_development_mode( 'theme' );
-    if ( $can_use_cached ) {
-        // Hash global settings and block nodes together to optimize performance of key generation.
-        $hash = md5(
-            wp_json_encode(
-                array(
-                    'global_setting' => wp_get_global_settings(),
-                    'block_nodes'    => $block_nodes,
-                )
-            )
-        );
-
-        $cache_key = "wp_styles_for_blocks:$hash";
-        $cached    = get_site_transient( $cache_key );
-        if ( ! is_array( $cached ) ) {
-            $cached = array();
-        }
-    }
-
-    $update_cache = false;
-
     foreach ( $block_nodes as $metadata ) {
-
-        if ( $can_use_cached ) {
-            // Use the block name as the key for cached CSS data. Otherwise, use a hash of the metadata.
-            $cache_node_key = isset( $metadata['name'] ) ? $metadata['name'] : md5( wp_json_encode( $metadata ) );
-
-            if ( isset( $cached[ $cache_node_key ] ) ) {
-                $block_css = $cached[ $cache_node_key ];
-            } else {
-                $block_css                 = $tree->get_styles_for_block( $metadata );
-                $cached[ $cache_node_key ] = $block_css;
-                $update_cache              = true;
-            }
-        } else {
-            $block_css = $tree->get_styles_for_block( $metadata );
-        }
+        $block_css = $tree->get_styles_for_block( $metadata );
 
         if ( ! wp_should_load_separate_core_block_assets() ) {
@@ -339 +303 @@
         }
     }
-
-    if ( $update_cache ) {
-        set_site_transient( $cache_key, $cached, HOUR_IN_SECONDS );
-    }
 }