|
@@ -82,7 +82,7 @@ class GlobalStylesColorCustomizer {
|
|
$user_color_palette = $theme_json['settings']['color']['palette']['user'];
|
|
$user_color_palette = $theme_json['settings']['color']['palette']['user'];
|
|
}
|
|
}
|
|
// End Gutenberg < 12.1 compatibility patch
|
|
// End Gutenberg < 12.1 compatibility patch
|
|
-
|
|
|
|
|
|
+
|
|
// Combine theme settings with user settings.
|
|
// Combine theme settings with user settings.
|
|
foreach ( $combined_color_palette as $key => $palette_item ) {
|
|
foreach ( $combined_color_palette as $key => $palette_item ) {
|
|
//make theme color value the default
|
|
//make theme color value the default
|
|
@@ -162,7 +162,7 @@ class GlobalStylesColorCustomizer {
|
|
$this->update_user_color_palette( $wp_customize );
|
|
$this->update_user_color_palette( $wp_customize );
|
|
|
|
|
|
// Get the user's theme.json from the CPT.
|
|
// Get the user's theme.json from the CPT.
|
|
- $user_custom_post_type_id = WP_Theme_JSON_Resolver_Gutenberg::get_user_custom_post_type_id();
|
|
|
|
|
|
+ $user_custom_post_type_id = WP_Theme_JSON_Resolver_Gutenberg::get_user_global_styles_post_id();
|
|
$user_theme_json_post = get_post( $user_custom_post_type_id );
|
|
$user_theme_json_post = get_post( $user_custom_post_type_id );
|
|
$user_theme_json_post_content = json_decode( $user_theme_json_post->post_content );
|
|
$user_theme_json_post_content = json_decode( $user_theme_json_post->post_content );
|
|
|
|
|