Changeset 58262 for trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-revisions-controller.php

Timestamp:

05/31/2024 01:17:50 AM (2 years ago)

Author:

noisysocks

Message:

Block Themes: Add support for relative URLs in top-level theme.json styles

Allow using relative file: URLs in top-level theme.json properties such as
styles.background, and modify the REST API to provide clients with the
absolute URLs via a '​https://api.w.org/theme-file' attribute in the _links
array.

Props ramonopoly.
Fixes #61273.

File:

• trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-revisions-controller.php (modified) (3 diffs)

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-revisions-controller.php

@@ -269 +269 @@
      *
      * @since 6.3.0
+     * @since 6.6.0 Added resolved URI links to the response.
      *
      * @param WP_Post         $post    Post revision object.
@@ -282 +283 @@
         }
 
-        $fields = $this->get_fields_for_response( $request );
-        $data   = array();
+        $fields     = $this->get_fields_for_response( $request );
+        $data       = array();
+        $theme_json = null;
 
         if ( ! empty( $global_styles_config['styles'] ) || ! empty( $global_styles_config['settings'] ) ) {
-            $global_styles_config = ( new WP_Theme_JSON( $global_styles_config, 'custom' ) )->get_raw_data();
+            $theme_json           = new WP_Theme_JSON( $global_styles_config, 'custom' );
+            $global_styles_config = $theme_json->get_raw_data();
             if ( rest_is_field_included( 'settings', $fields ) ) {
                 $data['settings'] = ! empty( $global_styles_config['settings'] ) ? $global_styles_config['settings'] : new stdClass();
@@ -323 +326 @@
         }
 
-        $context = ! empty( $request['context'] ) ? $request['context'] : 'view';
-        $data    = $this->add_additional_fields_to_object( $data, $request );
-        $data    = $this->filter_response_by_context( $data, $context );
-
-        return rest_ensure_response( $data );
+        $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 );
+        $resolved_theme_uris = WP_Theme_JSON_Resolver::get_resolved_theme_uris( $theme_json );
+
+        if ( ! empty( $resolved_theme_uris ) ) {
+            $response->add_links(
+                array(
+                    'https://api.w.org/theme-file' => $resolved_theme_uris,
+                )
+            );
+        }
+
+        return $response;
     }