From 95bbd4c7d140608fcf75fd5ff1fef0f2b6ca0b45 Mon Sep 17 00:00:00 2001
From: jorgefilipecosta <jorgefilipecosta@git.wordpress.org>
Date: Thu, 17 Feb 2022 13:47:59 +0000
Subject: [PATCH] Global Styles: Fix PHP warning in
 WP_REST_Global_Styles_Controller if no styles exist.

There is a PHP warning in WP_REST_Global_Styles_Controller because we are assuming that every theme.json has styles property, which is not always the case.

Props ntsekouras.
Fixes #54900.
Built from https://develop.svn.wordpress.org/trunk@52750


git-svn-id: http://core.svn.wordpress.org/trunk@52339 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../endpoints/class-wp-rest-global-styles-controller.php     | 5 ++++-
 wp-includes/version.php                                      | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php
index d9ff86e1fa..e6771ff851 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php
@@ -563,7 +563,10 @@ class WP_REST_Global_Styles_Controller extends WP_REST_Controller {
 		}
 
 		if ( rest_is_field_included( 'styles', $fields ) ) {
-			$data['styles'] = $theme->get_raw_data()['styles'];
+			$raw_data = $theme->get_raw_data();
+			if ( isset( $raw_data['styles'] ) ) {
+				$data['styles'] = $raw_data['styles'];
+			}
 		}
 
 		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 14d56ac2b0..3da121199a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.0-alpha-52749';
+$wp_version = '6.0-alpha-52750';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.