Pulling in changes from #38883 and adding the new block support prope…

…rties.

lib/block-supports/layout.php

@@ -138,8 +138,8 @@ function gutenberg_render_layout_support_flag( $block_content, $block ) {
 		return $block_content;
 	}
 
-	$block_gap             = wp_get_global_settings( array( 'spacing', 'blockGap' ) );
-	$default_layout        = wp_get_global_settings( array( 'layout' ) );
+	$block_gap             = gutenberg_get_global_settings( array( 'spacing', 'blockGap' ) );
+	$default_layout        = gutenberg_get_global_settings( array( 'layout' ) );
 	$has_block_gap_support = isset( $block_gap ) ? null !== $block_gap : false;
 	$default_block_layout  = _wp_array_get( $block_type->supports, array( '__experimentalLayout', 'default' ), array() );
 	$used_layout           = isset( $block['attrs']['layout'] ) ? $block['attrs']['layout'] : $default_block_layout;

lib/compat/wordpress-5.9/global-styles-css-custom-properties.php

@@ -13,7 +13,7 @@
 	 */
 	function wp_enqueue_global_styles_css_custom_properties() {
 		wp_register_style( 'global-styles-css-custom-properties', false, array(), true, true );
-		wp_add_inline_style( 'global-styles-css-custom-properties', wp_get_global_stylesheet( array( 'variables' ) ) );
+		wp_add_inline_style( 'global-styles-css-custom-properties', gutenberg_get_global_stylesheet( array( 'variables' ) ) );
 		wp_enqueue_style( 'global-styles-css-custom-properties' );
 	}
 	add_filter( 'enqueue_block_editor_assets', 'wp_enqueue_global_styles_css_custom_properties' );

lib/compat/wordpress-5.9/script-loader.php

@@ -28,7 +28,7 @@ function gutenberg_enqueue_global_styles_assets() {
 		return;
 	}
 
-	$stylesheet = wp_get_global_stylesheet();
+	$stylesheet = gutenberg_get_global_stylesheet();
 
 	if ( empty( $stylesheet ) ) {
 		return;

lib/compat/wordpress-6.0/class-gutenberg-rest-global-styles-controller.php

@@ -38,6 +38,54 @@ public function register_routes() {
 		parent::register_routes();
 	}
 
+		/**
+		 * Returns the given theme global styles config.
+		 *
+		 * @since 5.9.0
+		 *
+		 * @param WP_REST_Request $request The request instance.
+		 * @return WP_REST_Response|WP_Error
+		 */
+		public function get_theme_item( $request ) {
+			if ( wp_get_theme()->get_stylesheet() !== $request['stylesheet'] ) {
+				// This endpoint only supports the active theme for now.
+				return new WP_Error(
+					'rest_theme_not_found',
+					__( 'Theme not found.', 'gutenberg' ),
+					array( 'status' => 404 )
+				);
+			}
+
+			$theme  = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data( 'theme' );
+			$data   = array();
+			$fields = $this->get_fields_for_response( $request );
+
+			if ( rest_is_field_included( 'settings', $fields ) ) {
+				$data['settings'] = $theme->get_settings();
+			}
+
+			if ( rest_is_field_included( 'styles', $fields ) ) {
+				$raw_data       = $theme->get_raw_data();
+				$data['styles'] = isset( $raw_data['styles'] ) ? $raw_data['styles'] : array();
+			}
+
+			$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+			$data    = $this->add_additional_fields_to_object( $data, $request );
+			$data    = $this->filter_response_by_context( $data, $context );
+
+			$response = rest_ensure_response( $data );
+
+			$links = array(
+				'self' => array(
+					'href' => rest_url( sprintf( '%s/%s/themes/%s', $this->namespace, $this->rest_base, $request['stylesheet'] ) ),
+				),
+			);
+
+			$response->add_links( $links );
+
+			return $response;
+		}
+
 	/**
 	 * Checks if a given request has access to read a single theme global styles config.
 	 *