Changeset 53544 for trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php

Timestamp:

06/21/2022 10:46:49 AM (2 years ago)

Author:

spacedmonkey

Message:

REST API: Move all links to prepare_links method in theme REST API controller.

Move logic to generate link to global styles to the prepare_links method in theme REST API controller. This way all logic to generate links is within the prepare_links method, bringing this controller inline with other REST API controllers.

Props SergeyBiryukov, Spacedmonkey.
Fixes #56018.

File:

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

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php

@@ -334 +334 @@
         $response->add_links( $this->prepare_links( $theme ) );
 
-        if ( $theme->get_stylesheet() === wp_get_theme()->get_stylesheet() ) {
-            // This creates a record for the active theme if not existent.
-            $id = WP_Theme_JSON_Resolver::get_user_global_styles_post_id();
-        } else {
-            $user_cpt = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme );
-            $id       = isset( $user_cpt['ID'] ) ? $user_cpt['ID'] : null;
-        }
-
-        if ( $id ) {
-            $response->add_link(
-                'https://api.w.org/user-global-styles',
-                rest_url( 'wp/v2/global-styles/' . $id )
-            );
-        }
-
         /**
          * Filters theme data returned from the REST API.
@@ -370 +355 @@
      */
     protected function prepare_links( $theme ) {
-        return array(
+        $links = array(
             'self'       => array(
                 'href' => rest_url( sprintf( '%s/%s/%s', $this->namespace, $this->rest_base, $theme->get_stylesheet() ) ),
@@ -378 +363 @@
             ),
         );
+
+        if ( $this->is_same_theme( $theme, wp_get_theme() ) ) {
+            // This creates a record for the active theme if not existent.
+            $id = WP_Theme_JSON_Resolver::get_user_global_styles_post_id();
+        } else {
+            $user_cpt = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme );
+            $id       = isset( $user_cpt['ID'] ) ? $user_cpt['ID'] : null;
+        }
+
+        if ( $id ) {
+            $links['https://api.w.org/user-global-styles'] = array(
+                'href' => rest_url( 'wp/v2/global-styles/' . $id ),
+            );
+        }
+
+        return $links;
     }