Fix global styles override

WordPress · Sep 1, 2021 · eea9799 · eea9799
1 parent 9c0a85b
commit eea9799
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/lib/global-styles.php b/lib/global-styles.php
@@ -141,15 +141,17 @@ function_exists( 'gutenberg_is_edit_site_page' ) &&
 		}
 
 		// Reset existing global styles.
+		$styles_without_existing_global_styles = array();
 		foreach ( $settings['styles'] as $key => $style ) {
-			if ( isset( $style['__unstableType'] ) && 'globalStyles' === $style['__unstableType'] ) {
-				unset( $settings['styles'][ $key ] );
+			if ( ! isset( $style['__unstableType'] ) || 'globalStyles' !== $style['__unstableType'] ) {
+				$styles_without_existing_global_styles[] = $style;
 			}
 		}
 
 		// Add the new ones.
-		$settings['styles'][] = $css_variables;
-		$settings['styles'][] = $block_styles;
+		$styles_without_existing_global_styles[] = $css_variables;
+		$styles_without_existing_global_styles[] = $block_styles;
+		$settings['styles']                      = $styles_without_existing_global_styles;
 	}
 
 	// Copied from get_block_editor_settings() at wordpress-develop/block-editor.php.