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.

Built from https://develop.svn.wordpress.org/trunk@43973


git-svn-id: http://core.svn.wordpress.org/trunk@43805 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/includes/template.php

@@ -1256,7 +1256,7 @@ function do_accordion_sections( $screen, $context, $object ) {
 
 	$page = $screen->id;
 
-	$hidden = get_hidden_meta_boxes( $screen );
+	$hidden     = get_hidden_meta_boxes( $screen );
 	?>
 	<div id="side-sortables" class="accordion-container">
 		<ul class="outer-border">

wp-includes/media-template.php

@@ -96,7 +96,7 @@ function wp_underscore_video_template() {
 	<# if ( w ) { #>width="{{ w }}"<# } #>
 	<# if ( h ) { #>height="{{ h }}"<# } #>
 	<?php
-	$props = array(
+	$props       = array(
 		'poster'  => '',
 		'preload' => 'metadata',
 	);

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

@@ -375,7 +375,12 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
 
 		// 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'] );
+			}
+		}
 
 		/**
 		 * Filters an attachment returned from the REST API.

wp-includes/version.php

@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.1-alpha-43678';
+$wp_version = '5.1-alpha-43973';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.