From 4ab2703f354d2d550541cf177f161210b0357e41 Mon Sep 17 00:00:00 2001
From: Andrew Serong <14988353+andrewserong@users.noreply.github.com>
Date: Thu, 15 Dec 2022 14:12:02 +1100
Subject: [PATCH 1/2] Global Styles REST API endpoint: check custom CSS is
 included before attempting to validate

---
 .../class-gutenberg-rest-global-styles-controller-6-2.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/compat/wordpress-6.2/class-gutenberg-rest-global-styles-controller-6-2.php b/lib/compat/wordpress-6.2/class-gutenberg-rest-global-styles-controller-6-2.php
index 9f762dd961d058..f3286e4f60e860 100644
--- a/lib/compat/wordpress-6.2/class-gutenberg-rest-global-styles-controller-6-2.php
+++ b/lib/compat/wordpress-6.2/class-gutenberg-rest-global-styles-controller-6-2.php
@@ -152,9 +152,11 @@ protected function prepare_item_for_database( $request ) {
 			$config = array();
 			if ( isset( $request['styles'] ) ) {
 				$config['styles']    = $request['styles'];
-				$validate_custom_css = $this->validate_custom_css( $request['styles']['css'] );
-				if ( is_wp_error( $validate_custom_css ) ) {
-					return $validate_custom_css;
+				if ( isset( $request['styles']['css'] ) ) {
+					$validate_custom_css = $this->validate_custom_css( $request['styles']['css'] );
+					if ( is_wp_error( $validate_custom_css ) ) {
+						return $validate_custom_css;
+					}
 				}
 			} elseif ( isset( $existing_config['styles'] ) ) {
 				$config['styles'] = $existing_config['styles'];

From e88120077fc12653dde18419359d5fd17aadf7c7 Mon Sep 17 00:00:00 2001
From: Andrew Serong <14988353+andrewserong@users.noreply.github.com>
Date: Thu, 15 Dec 2022 14:24:27 +1100
Subject: [PATCH 2/2] Fix linting issue

---
 .../class-gutenberg-rest-global-styles-controller-6-2.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/compat/wordpress-6.2/class-gutenberg-rest-global-styles-controller-6-2.php b/lib/compat/wordpress-6.2/class-gutenberg-rest-global-styles-controller-6-2.php
index f3286e4f60e860..684786ef22d762 100644
--- a/lib/compat/wordpress-6.2/class-gutenberg-rest-global-styles-controller-6-2.php
+++ b/lib/compat/wordpress-6.2/class-gutenberg-rest-global-styles-controller-6-2.php
@@ -151,7 +151,7 @@ protected function prepare_item_for_database( $request ) {
 		if ( isset( $request['styles'] ) || isset( $request['settings'] ) ) {
 			$config = array();
 			if ( isset( $request['styles'] ) ) {
-				$config['styles']    = $request['styles'];
+				$config['styles'] = $request['styles'];
 				if ( isset( $request['styles']['css'] ) ) {
 					$validate_custom_css = $this->validate_custom_css( $request['styles']['css'] );
 					if ( is_wp_error( $validate_custom_css ) ) {