Changeset 43973

Timestamp:

12/11/2018 04:00:37 AM (8 years ago)

Author:

jorbin

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.

Merges [43681] to trunk.

Props TimothyBlynJacobs, danielbachhuber.
Fixes #44750.

Location:

trunk

Files:

• . (modified) (1 prop)
• package-lock.json (modified) (1 diff)
• src/wp-admin/includes/template.php (modified) (1 diff)
• src/wp-includes/media-template.php (modified) (1 diff)
• 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)

trunk/package-lock.json

@@ -1 +1 @@
 {
         "name": "WordPress",
-        "version": "5.0.0",
+        "version": "5.1.0",
         "lockfileVersion": 1,
         "requires": true,

trunk/src/wp-admin/includes/template.php

@@ -1257 +1257 @@
         $page = $screen->id;
 
-        $hidden = get_hidden_meta_boxes( $screen );
+        $hidden     = get_hidden_meta_boxes( $screen );
         ?>
         <div id="side-sortables" class="accordion-container">

trunk/src/wp-includes/media-template.php

@@ -97 +97 @@
         <# if ( h ) { #>height="{{ h }}"<# } #>
         <?php
-        $props = array(
+        $props       = array(
                 'poster'  => '',
                 'preload' => 'metadata',

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

@@ -376 +376 @@
                 // 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'] );
+                        }
+                }
 
                 /**

trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php

@@ -1468 +1468 @@
 
                 $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'] );
         }
 

trunk/tests/qunit/fixtures/wp-api-generated.js

@@ -4080 +4080 @@
             "self": [
                 {
-                    "attributes": [],
                     "href": "http://example.org/index.php?rest_route=/wp/v2/media/8"
                 }
@@ -4086 +4085 @@
             "collection": [
                 {
-                    "attributes": [],
                     "href": "http://example.org/index.php?rest_route=/wp/v2/media"
                 }
@@ -4092 +4090 @@
             "about": [
                 {
-                    "attributes": [],
                     "href": "http://example.org/index.php?rest_route=/wp/v2/types/attachment"
                 }
@@ -4098 +4095 @@
             "replies": [
                 {
-                    "attributes": {
-                        "embeddable": true
-                    },
+                    "embeddable": true,
                     "href": "http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=8"
                 }