Account for changes in __unstableType in WordPress core

WordPress · Feb 10, 2022 · 67001f9 · 67001f9
1 parent 3fbca90
commit 67001f9
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/global-styles.php b/lib/global-styles.php
@@ -46,7 +46,11 @@ function_exists( 'gutenberg_is_edit_site_page' ) &&
 		// Reset existing global styles.
 		$styles_without_existing_global_styles = array();
 		foreach ( $settings['styles'] as $style ) {
-			if ( ! isset( $style['__unstableType'] ) || 'globalStyles' !== $style['__unstableType'] ) {
+			if (
+				! isset( $style['__unstableType'] ) ||
+				// 'globalStyles' is for WordPress 5.8. 'theme' and 'presets' is for WordPress 5.9.
+				! in_array( $style['__unstableType'], array( 'globalStyles', 'theme', 'presets' ), true )
+			) {
 				$styles_without_existing_global_styles[] = $style;
 			}
 		}