Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WP_Theme_JSON: Invalidate blocks metadata cache when needed #3359

Closed
wants to merge 11 commits into from
Closed

WP_Theme_JSON: Invalidate blocks metadata cache when needed #3359

Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
514f23e
WP_Theme_JSON: Invalidate blocks metadata cache when needed
ockham Sep 28, 2022
2072c0d
Add back block_metadata init
ockham Sep 28, 2022
163b21c
Change variable name and add comment
ockham Sep 28, 2022
e9897ff
Oops
ockham Sep 28, 2022
d7dcc6a
That's more like it
ockham Sep 28, 2022
b746d24
Caching is overrated :yolo:
ockham Sep 29, 2022
8d46f0a
Revert "Caching is overrated :yolo:"
ockham Oct 4, 2022
103bc47
Initialize blocks_metadata as empty array
ockham Oct 4, 2022
bdc0923
Use `empty()` instead of `count(...) === 0`
ockham Oct 4, 2022
a9787c0
Avoid "we" in comment
ockham Oct 4, 2022
25b560a
Fix PHPDoc comment
ockham Oct 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/wp-includes/class-wp-theme-json.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,10 @@ class WP_Theme_JSON {
* process it twice.
*
* @since 5.8.0
* @since 6.1.0 Initialize as empty array.
ockham marked this conversation as resolved.
Show resolved Hide resolved
* @var array
*/
protected static $blocks_metadata = null;
protected static $blocks_metadata = array();

/**
* The CSS selector for the top-level styles.
Expand Down Expand Up @@ -729,14 +730,15 @@ protected static function append_to_selector( $selector, $to_append, $position =
* @return array Block metadata.
*/
protected static function get_blocks_metadata() {
if ( null !== static::$blocks_metadata ) {
$registry = WP_Block_Type_Registry::get_instance();
$blocks = $registry->get_all_registered();

// Do we have metadata for all currently registered blocks?
ockham marked this conversation as resolved.
Show resolved Hide resolved
$blocks = array_diff_key( $blocks, static::$blocks_metadata );
if ( count( $blocks ) === 0 ) {
ockham marked this conversation as resolved.
Show resolved Hide resolved
return static::$blocks_metadata;
}

static::$blocks_metadata = array();

$registry = WP_Block_Type_Registry::get_instance();
$blocks = $registry->get_all_registered();
foreach ( $blocks as $block_name => $block_type ) {
if (
isset( $block_type->supports['__experimentalSelector'] ) &&
Expand Down