Changeset 59335

Timestamp:

11/01/2024 05:24:53 AM (6 weeks ago)

Author:

ramonopoly

Message:

Theme JSON: replace top-level background style objects on merge

This commit fixes an omission in the logic of WP_Theme_JSON::merge() where top-level background image style objects are not replaced, rather they are merged. Because background images are self contained objects, their properties are unique and should not be merged. Blocks are already catered for via WP_Theme_JSON::get_block_nodes().

Follow-up to [61858].

Props ramonopoly, andrewserong.
Fixes #62328.

Location:

trunk

Files:

• src/wp-includes/class-wp-theme-json.php (modified) (1 diff)
• tests/phpunit/tests/theme/wpThemeJson.php (modified) (3 diffs)

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

@@ -3269 +3269 @@
             array( 'include_node_paths_only' => true )
         );
+
+        // Add top-level styles.
+        $style_nodes[] = array( 'path' => array( 'styles' ) );
+
         foreach ( $style_nodes as $style_node ) {
             $path = $style_node['path'];

trunk/tests/phpunit/tests/theme/wpThemeJson.php

@@ -2345 +2345 @@
                     'background' => array(
                         'backgroundImage' => array(
-                            'url' => 'http://example.org/quote.png',
+                            'id'     => 'uploaded',
+                            'source' => 'file',
+                            'url'    => 'http://example.org/quote.png',
                         ),
                         'backgroundSize'  => 'cover',
@@ -2377 +2379 @@
             'styles'  => array(
                 'background' => array(
-                    'backgroundSize' => 'contain',
+                    'backgroundImage' => array(
+                        'url' => 'http://example.org/site.png',
+                    ),
+                    'backgroundSize'  => 'contain',
                 ),
                 'blocks'     => array(
@@ -2407 +2412 @@
                 'background' => array(
                     'backgroundImage' => array(
-                        'url' => 'http://example.org/quote.png',
+                        'url' => 'http://example.org/site.png',
                     ),
                     'backgroundSize'  => 'contain',