Changeset 54121 for trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php

Timestamp:

09/11/2022 06:53:28 PM (2 years ago)

Author:

TimothyBlynJacobs

Message:

REST API: Use helper functions for building routes in more places.

Props get_dave, spacedmonkey.
Fixes #56472.

File:

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

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

@@ -419 +419 @@
 
         $request_params = $request->get_query_params();
-        $base           = add_query_arg( urlencode_deep( $request_params ), rest_url( sprintf( '%s/%s', $this->namespace, $this->rest_base ) ) );
+        $collection_url = rest_url( rest_get_route_for_post_type_items( $this->post_type ) );
+        $base           = add_query_arg( urlencode_deep( $request_params ), $collection_url );
 
         if ( $page > 1 ) {
@@ -778 +779 @@
 
         $response->set_status( 201 );
-        $response->header( 'Location', rest_url( sprintf( '%s/%s/%d', $this->namespace, $this->rest_base, $post_id ) ) );
+        $response->header( 'Location', rest_url( rest_get_route_for_post( $post ) ) );
 
         return $response;
@@ -2031 +2032 @@
      */
     protected function prepare_links( $post ) {
-        $base = sprintf( '%s/%s', $this->namespace, $this->rest_base );
-
         // Entity meta.
         $links = array(
             'self'       => array(
-                'href' => rest_url( trailingslashit( $base ) . $post->ID ),
+                'href' => rest_url( rest_get_route_for_post( $post->ID ) ),
             ),
             'collection' => array(
-                'href' => rest_url( $base ),
+                'href' => rest_url( rest_get_route_for_post_type_items( $this->post_type ) ),
             ),
             'about'      => array(
@@ -2067 +2066 @@
             $revisions       = wp_get_latest_revision_id_and_total_count( $post->ID );
             $revisions_count = ! is_wp_error( $revisions ) ? $revisions['count'] : 0;
+            $revisions_base  = sprintf( '/%s/%s/%d/revisions', $this->namespace, $this->rest_base, $post->ID );
 
             $links['version-history'] = array(
-                'href'  => rest_url( trailingslashit( $base ) . $post->ID . '/revisions' ),
+                'href'  => rest_url( $revisions_base ),
                 'count' => $revisions_count,
             );
@@ -2075 +2075 @@
             if ( $revisions_count > 0 ) {
                 $links['predecessor-version'] = array(
-                    'href' => rest_url( trailingslashit( $base ) . $post->ID . '/revisions/' . $revisions['latest_id'] ),
+                    'href' => rest_url( $revisions_base . '/' . $revisions['latest_id'] ),
                     'id'   => $revisions['latest_id'],
                 );