Move optimizing to gutenberg_get_global_stylesheet

WordPress · Aug 5, 2022 · cf6f4e6 · cf6f4e6
1 parent eaba42c
commit cf6f4e6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/lib/compat/wordpress-6.1/class-wp-theme-json-6-1.php b/lib/compat/wordpress-6.1/class-wp-theme-json-6-1.php
@@ -644,14 +644,7 @@ public function get_stylesheet( $types = array( 'variables', 'styles', 'presets'
 			$stylesheet .= $this->get_preset_classes( $setting_nodes, $origins );
 		}
 
-		$processor = new WP_Style_Engine_Processor_Gutenberg();
-		$processor->add_css_string( $stylesheet );
-
-		return $processor->get_css(
-			array(
-				'prettify' => defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG,
-			)
-		);
+		return $stylesheet;
 	}
 
 	/**

diff --git a/lib/compat/wordpress-6.1/get-global-styles-and-settings.php b/lib/compat/wordpress-6.1/get-global-styles-and-settings.php
@@ -116,5 +116,13 @@ function gutenberg_get_global_stylesheet( $types = array() ) {
 		// This cache doesn't need to be any longer, we only want to avoid spikes on high-traffic sites.
 		set_transient( $transient_name, $stylesheet, MINUTE_IN_SECONDS );
 	}
-	return $stylesheet;
+
+	$processor = new WP_Style_Engine_Processor_Gutenberg();
+	$processor->add_css_string( $stylesheet );
+
+	return $processor->get_css(
+		array(
+			'prettify' => defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG,
+		)
+	);
 }
diff --git a/packages/style-engine/class-wp-style-engine-css-declarations.php b/packages/style-engine/class-wp-style-engine-css-declarations.php
@@ -157,7 +157,7 @@ public function get_declarations_string( $should_prettify = false, $indent_count
 	 * @return string The sanitized property name.
 	 */
 	protected function sanitize_property( $property ) {
-		return sanitize_key( $property );
+		return trim( sanitize_key( $property ) );
 	}
 
 	/**