Changeset 58429 for trunk/src/wp-includes/block-supports/block-style-variations.php

Timestamp:

06/18/2024 07:07:52 AM (6 months ago)

Author:

oandregal

Message:

Do not use init to register block style variations defined via theme.json.

Props oandregal, aaronrobertshaw, joemcgill, ramonopoly, andrewserong, swissspidy.
See #61451.
Fixes #61312.

File:

• trunk/src/wp-includes/block-supports/block-style-variations.php (modified) (1 diff)

trunk/src/wp-includes/block-supports/block-style-variations.php

@@ -462 +462 @@
     }
 }
-
-/**
- * Register shared block style variations defined by the theme.
- *
- * These can come in three forms:
- * - the theme's theme.json
- * - the theme's partials (standalone files in `/styles` that only define block style variations)
- * - the user's theme.json (for example, theme style variations the user selected)
- *
- * @since 6.6.0
- * @access private
- */
-function wp_register_block_style_variations_from_theme() {
-    /*
-     * Skip any registration of styles if no theme.json or variation partials are present.
-     *
-     * Given the possibility of hybrid themes, this check can't rely on if the theme
-     * is a block theme or not. Instead:
-     *   - If there is a primary theme.json, continue.
-     *   - If there is a partials directory, continue.
-     *   - The only variations to be registered from the global styles user origin,
-     *     are those that have been copied in from the selected theme style variation.
-     *     For a theme style variation to be selected it would have to have a partial
-     *     theme.json file covered by the previous check.
-     */
-    $has_partials_directory = is_dir( get_stylesheet_directory() . '/styles' ) || is_dir( get_template_directory() . '/styles' );
-    if ( ! wp_theme_has_theme_json() && ! $has_partials_directory ) {
-        return;
-    }
-
-    // Partials from `/styles`.
-    $variations_partials = WP_Theme_JSON_Resolver::get_style_variations( 'block' );
-    wp_register_block_style_variations_from_theme_json_data( $variations_partials );
-
-    /*
-     * Pull the data from the specific origin instead of the merged data.
-     * This is because, for 6.6, we only support registering block style variations
-     * for the 'theme' and 'custom' origins but not for 'default' (core theme.json)
-     * or 'custom' (theme.json in a block).
-     *
-     * When/If we add support for every origin, we should switch to using the public API
-     * instead, e.g.: wp_get_global_styles( array( 'blocks', 'variations' ) ).
-     */
-
-    // theme.json of the theme.
-    $theme_json_theme = WP_Theme_JSON_Resolver::get_theme_data();
-    $variations_theme = $theme_json_theme->get_data()['styles']['blocks']['variations'] ?? array();
-    wp_register_block_style_variations_from_theme_json_data( $variations_theme );
-
-    // User data linked for this theme.
-    $theme_json_user = WP_Theme_JSON_Resolver::get_user_data();
-    $variations_user = $theme_json_user->get_data()['styles']['blocks']['variations'] ?? array();
-    wp_register_block_style_variations_from_theme_json_data( $variations_user );
-}
-add_action( 'init', 'wp_register_block_style_variations_from_theme' );