Bring back changes from 61262

oandregal · oandregal · commit b14c86915131 · 2024-06-05T09:27:03.000+02:00
diff --git a/lib/class-wp-theme-json-resolver-gutenberg.php b/lib/class-wp-theme-json-resolver-gutenberg.php
@@ -540,10 +540,8 @@ public static function get_user_data() {
 		}
 
 		/** 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' ) );
-		$config     = $theme_json->get_data();
-
-		static::$user = new WP_Theme_JSON_Gutenberg( $config, 'custom' );
+		$theme_json   = apply_filters( 'wp_theme_json_data_user', new WP_Theme_JSON_Data_Gutenberg( $config, 'custom' ) );
+		static::$user = $theme_json->get_theme_json();
 
 		return static::$user;
 	}

Original file line number	Diff line number	Diff line change
`@@ -540,10 +540,8 @@ public static function get_user_data() {`
`540`	`540`	`}`
`541`	`541`
`542`	`542`	`/** This filter is documented in wp-includes/class-wp-theme-json-resolver.php */`
`543`		`- $theme_json = apply_filters( 'wp_theme_json_data_user', new WP_Theme_JSON_Data_Gutenberg( $config, 'custom' ) );`
`544`		`- $config = $theme_json->get_data();`
`545`		`-`
`546`		`- static::$user = new WP_Theme_JSON_Gutenberg( $config, 'custom' );`
	`543`	`+ $theme_json = apply_filters( 'wp_theme_json_data_user', new WP_Theme_JSON_Data_Gutenberg( $config, 'custom' ) );`
	`544`	`+ static::$user = $theme_json->get_theme_json();`
`547`	`545`
`548`	`546`	`return static::$user;`
`549`	`547`	`}`