Changeset 61190 for trunk/src/wp-includes/class-wp-theme-json.php

Timestamp:

11/10/2025 06:41:03 AM (4 months ago)

Author:

wildworks

Message:

Editor: Fix handling of default presets at block level in theme.json

Fix an issue where block-level presets do not work correctly when default presets are disabled and the slug matches a default preset.

Props aaronrobertshaw, bph, ramonopoly, wildworks.
Fixes #64195.

File:

• trunk/src/wp-includes/class-wp-theme-json.php (modified) (1 diff)

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

@@ -3251 +3251 @@
                 $prevent_override = $preset_metadata['prevent_override'];
                 if ( is_array( $prevent_override ) ) {
-                    $prevent_override = _wp_array_get( $this->theme_json['settings'], $preset_metadata['prevent_override'] );
+                    $global_path  = array_merge( array( 'settings' ), $prevent_override );
+                    $global_value = _wp_array_get( $this->theme_json, $global_path, null );
+
+                    $node_level_path  = array_merge( $node['path'], $prevent_override );
+                    $prevent_override = _wp_array_get( $this->theme_json, $node_level_path, $global_value );
                 }