Changeset 59262

Timestamp:

10/21/2024 04:46:39 AM (6 weeks ago)

Author:

ramonopoly

Message:

Theme JSON: remove redundant styles check and relocate $selectors assignment.

In WP_Theme_JSON::get_block_nodes(), remove redundant check for $theme_json['styles'], which means WP_Theme_JSON::get_blocks_metadata() is only called if necessary.

Also skip unnecessary $selector assignment if only nodes are to be returned.

Props ramonopoly, mukesh27.
Fixes #62234.

File:

• trunk/src/wp-includes/class-wp-theme-json.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-theme-json.php

@@ -2708 +2708 @@
      */
     private static function get_block_nodes( $theme_json, $selectors = array(), $options = array() ) {
-        $selectors = empty( $selectors ) ? static::get_blocks_metadata() : $selectors;
-        $nodes     = array();
-        if ( ! isset( $theme_json['styles'] ) ) {
-            return $nodes;
-        }
-
-        // Blocks.
+        $nodes = array();
+
         if ( ! isset( $theme_json['styles']['blocks'] ) ) {
             return $nodes;
@@ -2721 +2716 @@
         $include_variations      = $options['include_block_style_variations'] ?? false;
         $include_node_paths_only = $options['include_node_paths_only'] ?? false;
+
+        // If only node paths are to be returned, skip selector assignment.
+        if ( ! $include_node_paths_only ) {
+            $selectors = empty( $selectors ) ? static::get_blocks_metadata() : $selectors;
+        }
 
         foreach ( $theme_json['styles']['blocks'] as $name => $node ) {