Changeset 52678

Timestamp:

02/04/2022 02:46:27 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Themes: Fix for Classic themes using default presets.

This commit makes the presets provided by the theme via add_theme_support() always create CSS Custom Properties, whether or not the theme has a theme.json file. This way, if the theme overwrites a core preset, the core CSS variables are also overwritten and use the theme value.

Props oandregal, hellofromTonya, desrosj, costdev, pbearne, johnstonphilip, webmandesign, jorgefilipecosta, SergeyBiryukov.
Merges [52675-52677] to the 5.9 branch.
Fixes #54782.

Location:

branches/5.9

Files:

• . (modified) (1 prop)
• src/wp-includes/global-styles-and-settings.php (modified) (2 diffs)
• tests/phpunit/tests/theme/globalStylesheet.php (copied) (copied from trunk/tests/phpunit/tests/theme/globalStylesheet.php )

branches/5.9/src/wp-includes/global-styles-and-settings.php

@@ -104 +104 @@
         }
 
+        $tree = WP_Theme_JSON_Resolver::get_merged_data();
+
         $supports_theme_json = WP_Theme_JSON_Resolver::theme_has_support();
-        $supports_link_color = get_theme_support( 'experimental-link-color' );
         if ( empty( $types ) && ! $supports_theme_json ) {
                 $types = array( 'variables', 'presets' );
@@ -112 +113 @@
         }
 
-        $origins = array( 'default', 'theme', 'custom' );
-        if ( ! $supports_theme_json && ! $supports_link_color ) {
-                // In this case we only enqueue the core presets (CSS Custom Properties + the classes).
-                $origins = array( 'default' );
-        } elseif ( ! $supports_theme_json && $supports_link_color ) {
-                // For the legacy link color feature to work, the CSS Custom Properties
-                // should be in scope (either the core or the theme ones).
-                $origins = array( 'default', 'theme' );
+        /*
+         * If variables are part of the stylesheet,
+         * we add them for all origins (default, theme, user).
+         * This is so themes without a theme.json still work as before 5.9:
+         * they can override the default presets.
+         * See https://core.trac.wordpress.org/ticket/54782
+         */
+        $styles_variables = '';
+        if ( in_array( 'variables', $types, true ) ) {
+                $styles_variables = $tree->get_stylesheet( array( 'variables' ) );
+                $types            = array_diff( $types, array( 'variables' ) );
         }
 
-        $tree       = WP_Theme_JSON_Resolver::get_merged_data();
-        $stylesheet = $tree->get_stylesheet( $types, $origins );
+        /*
+         * For the remaining types (presets, styles), we do consider origins:
+         *
+         * - themes without theme.json: only the classes for the presets defined by core
+         * - themes with theme.json: the presets and styles classes, both from core and the theme
+         */
+        $styles_rest = '';
+        if ( ! empty( $types ) ) {
+                $origins = array( 'default', 'theme', 'custom' );
+                if ( ! $supports_theme_json ) {
+                        $origins = array( 'default' );
+                }
+                $styles_rest = $tree->get_stylesheet( $types, $origins );
+        }
+
+        $stylesheet = $styles_variables . $styles_rest;
 
         if ( $can_use_cached ) {