Changeset 43681

Timestamp:

10/08/2018 06:18:25 PM (6 years ago)

Author:

danielbachhuber

Message:

REST API: Persist attributes for attachment links

In [43437], the link definition implementation caused attachment links to be unexpectedly nested under an attributes key. This changeset restores the prior behavior.

Props TimothyBlynJacobs.
Fixes #44750.

Location:

branches/5.0

Files:

• src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php (modified) (1 diff)
• tests/phpunit/tests/rest-api/rest-attachments-controller.php (modified) (1 diff)
• tests/qunit/fixtures/wp-api-generated.js (modified) (4 diffs)

branches/5.0/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php

@@ -373 +373 @@
         // Wrap the data in a response object.
         $response = rest_ensure_response( $data );
-        $response->add_links( $links );
+
+        foreach ( $links as $rel => $rel_links ) {
+            foreach ( $rel_links as $link ) {
+                $response->add_link( $rel, $link['href'], $link['attributes'] );
+            }
+        }
 
         /**

branches/5.0/tests/phpunit/tests/rest-api/rest-attachments-controller.php

@@ -1261 +1261 @@
 
         $this->assertArrayHasKey( 'self', $links );
+        $this->assertArrayHasKey( 'author', $links );
+
+        $this->assertCount( 1, $links['author'] );
+        $this->assertArrayHasKey( 'embeddable', $links['author'][0]['attributes'] );
+        $this->assertTrue( $links['author'][0]['attributes']['embeddable'] );
     }
 

branches/5.0/tests/qunit/fixtures/wp-api-generated.js

@@ -3944 +3944 @@
             "self": [
                 {
-                    "attributes": [],
                     "href": "http://example.org/index.php?rest_route=/wp/v2/media/8"
                 }
@@ -3950 +3949 @@
             "collection": [
                 {
-                    "attributes": [],
                     "href": "http://example.org/index.php?rest_route=/wp/v2/media"
                 }
@@ -3956 +3954 @@
             "about": [
                 {
-                    "attributes": [],
                     "href": "http://example.org/index.php?rest_route=/wp/v2/types/attachment"
                 }
@@ -3962 +3959 @@
             "replies": [
                 {
-                    "attributes": {
-                        "embeddable": true
-                    },
+                    "embeddable": true,
                     "href": "http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=8"
                 }