Remove variation style registration from theme json and theme style v…

…ariations

lib/class-wp-rest-global-styles-controller-gutenberg.php

@@ -331,14 +331,9 @@ protected function prepare_item_for_database( $request ) {
 				$config['styles'] = $existing_config['styles'];
 			}
 
-			// Register theme-defined variations.
+			// Register theme-defined variations e.g. from block style variation partials under `/styles`.
 			WP_Theme_JSON_Resolver_Gutenberg::get_theme_data();
 
-			// Register user-defined variations.
-			if ( isset( $request['styles']['blocks']['variations'] ) && ! empty( $config['styles']['blocks']['variations'] ) ) {
-				gutenberg_register_block_style_variations_from_theme_json_data( $config['styles']['blocks']['variations'] );
-			}
-
 			if ( isset( $request['settings'] ) ) {
 				$config['settings'] = $request['settings'];
 			} elseif ( isset( $existing_config['settings'] ) ) {

lib/class-wp-theme-json-resolver-gutenberg.php

@@ -247,10 +247,6 @@ public static function get_theme_data( $deprecated = array(), $options = array()
 				$theme_json_data = array( 'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA );
 			}
 
-			// Register variations defined by the theme.
-			$variations = $theme_json_data['styles']['blocks']['variations'] ?? array();
-			gutenberg_register_block_style_variations_from_theme_json_data( $variations );
-
 			// Register variations defined by theme partials (theme.json files in the styles directory).
 			$variations = static::get_style_variations( 'block' );
 			gutenberg_register_block_style_variations_from_theme_json_data( $variations );
@@ -547,10 +543,6 @@ public static function get_user_data() {
 			}
 		}
 
-		// Register variations defined by the user.
-		$variations = $config['styles']['blocks']['variations'] ?? array();
-		gutenberg_register_block_style_variations_from_theme_json_data( $variations );
-
 		/** This filter is documented in wp-includes/class-wp-theme-json-resolver.php */
 		$theme_json   = apply_filters( 'wp_theme_json_data_user', new WP_Theme_JSON_Data_Gutenberg( $config, 'custom' ) );
 		static::$user = $theme_json->get_theme_json();