<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[53724] trunk/src/wp-includes/rest-api/endpoints: Coding Standards: Use consistent placement for `::prepare_links()` methods.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/53724">53724</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/53724","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-07-19 16:20:54 +0000 (Tue, 19 Jul 2022)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Coding Standards: Use consistent placement for `::prepare_links()` methods.

This moves the `::prepare_links()` methods in REST API classes next to `::prepare_item_for_response()` where they are used, to bring some consistency across the classes and make code navigation easier.

Includes wrapping some long lines for better readability.

Follow-up to <a href="https://core.trac.wordpress.org/changeset/52079">[52079]</a>, <a href="https://core.trac.wordpress.org/changeset/52051">[52051]</a>, <a href="https://core.trac.wordpress.org/changeset/52342">[52342]</a>, <a href="https://core.trac.wordpress.org/changeset/53721">[53721]</a>, <a href="https://core.trac.wordpress.org/changeset/53722">[53722]</a>.

See <a href="https://core.trac.wordpress.org/ticket/55647">#55647</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestapplicationpasswordscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-application-passwords-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestblocktypescontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestglobalstylescontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestmenulocationscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-menu-locations-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestpluginscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-plugins-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestposttypescontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswpresttaxonomiescontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesrestapiendpointsclasswprestapplicationpasswordscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-application-passwords-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-application-passwords-controller.php       2022-07-19 16:17:56 UTC (rev 53723)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-application-passwords-controller.php 2022-07-19 16:20:54 UTC (rev 53724)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -653,7 +653,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">        protected function prepare_links( WP_User $user, $item ) {
</span><span class="cx" style="display: block; padding: 0 10px">                return array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'self' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'href' => rest_url( sprintf( '%s/users/%d/application-passwords/%s', $this->namespace, $user->ID, $item['uuid'] ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'href' => rest_url(
+                                       sprintf(
+                                               '%s/users/%d/application-passwords/%s',
+                                               $this->namespace,
+                                               $user->ID,
+                                               $item['uuid']
+                                       )
+                               ),
</ins><span class="cx" style="display: block; padding: 0 10px">                         ),
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestblocktypescontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php 2022-07-19 16:17:56 UTC (rev 53723)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php   2022-07-19 16:20:54 UTC (rev 53724)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -347,7 +347,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( $block_type->is_dynamic() ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        $links['https://api.w.org/render-block'] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'href' => add_query_arg( 'context', 'edit', rest_url( sprintf( '%s/%s/%s', 'wp/v2', 'block-renderer', $block_type->name ) ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'href' => add_query_arg(
+                                       'context',
+                                       'edit',
+                                       rest_url( sprintf( '%s/%s/%s', 'wp/v2', 'block-renderer', $block_type->name ) )
+                               ),
</ins><span class="cx" style="display: block; padding: 0 10px">                         );
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestglobalstylescontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php       2022-07-19 16:17:56 UTC (rev 53723)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php 2022-07-19 16:20:54 UTC (rev 53724)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,6 +126,34 @@
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * Get the post, if the ID is valid.
+        *
+        * @since 5.9.0
+        *
+        * @param int $id Supplied ID.
+        * @return WP_Post|WP_Error Post object if ID is valid, WP_Error otherwise.
+        */
+       protected function get_post( $id ) {
+               $error = new WP_Error(
+                       'rest_global_styles_not_found',
+                       __( 'No global styles config exist with that id.' ),
+                       array( 'status' => 404 )
+               );
+
+               $id = (int) $id;
+               if ( $id <= 0 ) {
+                       return $error;
+               }
+
+               $post = get_post( $id );
+               if ( empty( $post ) || empty( $post->ID ) || $this->post_type !== $post->post_type ) {
+                       return $error;
+               }
+
+               return $post;
+       }
+
+       /**
</ins><span class="cx" style="display: block; padding: 0 10px">          * Checks if a given request has access to read a single global style.
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * @since 5.9.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -378,35 +406,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Get the post, if the ID is valid.
-        *
-        * @since 5.9.0
-        *
-        * @param int $id Supplied ID.
-        * @return WP_Post|WP_Error Post object if ID is valid, WP_Error otherwise.
-        */
-       protected function get_post( $id ) {
-               $error = new WP_Error(
-                       'rest_global_styles_not_found',
-                       __( 'No global styles config exist with that id.' ),
-                       array( 'status' => 404 )
-               );
-
-               $id = (int) $id;
-               if ( $id <= 0 ) {
-                       return $error;
-               }
-
-               $post = get_post( $id );
-               if ( empty( $post ) || empty( $post->ID ) || $this->post_type !== $post->post_type ) {
-                       return $error;
-               }
-
-               return $post;
-       }
-
-
-       /**
</del><span class="cx" style="display: block; padding: 0 10px">          * Prepares links for the request.
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * @since 5.9.0
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestmenulocationscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-menu-locations-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-menu-locations-controller.php      2022-07-19 16:17:56 UTC (rev 53723)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-menu-locations-controller.php        2022-07-19 16:20:54 UTC (rev 53724)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,6 +208,44 @@
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * Prepares links for the request.
+        *
+        * @since 5.9.0
+        *
+        * @param stdClass $location Menu location.
+        * @return array Links for the given menu location.
+        */
+       protected function prepare_links( $location ) {
+               $base = sprintf( '%s/%s', $this->namespace, $this->rest_base );
+
+               // Entity meta.
+               $links = array(
+                       'self'       => array(
+                               'href' => rest_url( trailingslashit( $base ) . $location->name ),
+                       ),
+                       'collection' => array(
+                               'href' => rest_url( $base ),
+                       ),
+               );
+
+               $locations = get_nav_menu_locations();
+               $menu      = isset( $locations[ $location->name ] ) ? $locations[ $location->name ] : 0;
+               if ( $menu ) {
+                       $path = rest_get_route_for_term( $menu );
+                       if ( $path ) {
+                               $url = rest_url( $path );
+
+                               $links['https://api.w.org/menu'][] = array(
+                                       'href'       => $url,
+                                       'embeddable' => true,
+                               );
+                       }
+               }
+
+               return $links;
+       }
+
+       /**
</ins><span class="cx" style="display: block; padding: 0 10px">          * Retrieves the menu location's schema, conforming to JSON Schema.
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * @since 5.9.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -260,42 +298,4 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        'context' => $this->get_context_param( array( 'default' => 'view' ) ),
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-       /**
-        * Prepares links for the request.
-        *
-        * @since 5.9.0
-        *
-        * @param stdClass $location Menu location.
-        * @return array Links for the given menu location.
-        */
-       protected function prepare_links( $location ) {
-               $base = sprintf( '%s/%s', $this->namespace, $this->rest_base );
-
-               // Entity meta.
-               $links = array(
-                       'self'       => array(
-                               'href' => rest_url( trailingslashit( $base ) . $location->name ),
-                       ),
-                       'collection' => array(
-                               'href' => rest_url( $base ),
-                       ),
-               );
-
-               $locations = get_nav_menu_locations();
-               $menu      = isset( $locations[ $location->name ] ) ? $locations[ $location->name ] : 0;
-               if ( $menu ) {
-                       $path = rest_get_route_for_term( $menu );
-                       if ( $path ) {
-                               $url = rest_url( $path );
-
-                               $links['https://api.w.org/menu'][] = array(
-                                       'href'       => $url,
-                                       'embeddable' => true,
-                               );
-                       }
-               }
-
-               return $links;
-       }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestpluginscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-plugins-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-plugins-controller.php     2022-07-19 16:17:56 UTC (rev 53723)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-plugins-controller.php       2022-07-19 16:20:54 UTC (rev 53724)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -625,7 +625,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">        protected function prepare_links( $item ) {
</span><span class="cx" style="display: block; padding: 0 10px">                return array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'self' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'href' => rest_url( sprintf( '%s/%s/%s', $this->namespace, $this->rest_base, substr( $item['_file'], 0, - 4 ) ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'href' => rest_url(
+                                       sprintf(
+                                               '%s/%s/%s',
+                                               $this->namespace,
+                                               $this->rest_base,
+                                               substr( $item['_file'], 0, - 4 )
+                                       )
+                               ),
</ins><span class="cx" style="display: block; padding: 0 10px">                         ),
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestposttypescontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php  2022-07-19 16:17:56 UTC (rev 53723)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php    2022-07-19 16:20:54 UTC (rev 53724)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -261,6 +261,25 @@
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * Prepares links for the request.
+        *
+        * @since 6.1.0
+        *
+        * @param WP_Post_Type $post_type The post type.
+        * @return array Links for the given post type.
+        */
+       protected function prepare_links( $post_type ) {
+               return array(
+                       'collection'              => array(
+                               'href' => rest_url( sprintf( '%s/%s', $this->namespace, $this->rest_base ) ),
+                       ),
+                       'https://api.w.org/items' => array(
+                               'href' => rest_url( rest_get_route_for_post_type_items( $post_type->name ) ),
+                       ),
+               );
+       }
+
+       /**
</ins><span class="cx" style="display: block; padding: 0 10px">          * Retrieves the post type's schema, conforming to JSON Schema.
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * @since 4.7.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -384,23 +403,4 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        'context' => $this->get_context_param( array( 'default' => 'view' ) ),
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-       /**
-        * Prepares links for the request.
-        *
-        * @since 6.1.0
-        *
-        * @param WP_Post_Type $post_type The post type.
-        * @return array Links for the given post type.
-        */
-       protected function prepare_links( $post_type ) {
-               return array(
-                       'collection'              => array(
-                               'href' => rest_url( sprintf( '%s/%s', $this->namespace, $this->rest_base ) ),
-                       ),
-                       'https://api.w.org/items' => array(
-                               'href' => rest_url( rest_get_route_for_post_type_items( $post_type->name ) ),
-                       ),
-               );
-       }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswpresttaxonomiescontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php  2022-07-19 16:17:56 UTC (rev 53723)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php    2022-07-19 16:20:54 UTC (rev 53724)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -289,6 +289,25 @@
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * Prepares links for the request.
+        *
+        * @since 6.1.0
+        *
+        * @param @param WP_Taxonomy $taxonomy The taxonomy.
+        * @return array Links for the given taxonomy.
+        */
+       protected function prepare_links( $taxonomy ) {
+               return array(
+                       'collection'              => array(
+                               'href' => rest_url( sprintf( '%s/%s', $this->namespace, $this->rest_base ) ),
+                       ),
+                       'https://api.w.org/items' => array(
+                               'href' => rest_url( rest_get_route_for_taxonomy_items( $taxonomy->name ) ),
+                       ),
+               );
+       }
+
+       /**
</ins><span class="cx" style="display: block; padding: 0 10px">          * Retrieves the taxonomy's schema, conforming to JSON Schema.
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * @since 4.7.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -427,24 +446,4 @@
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="cx" style="display: block; padding: 0 10px">                return $new_params;
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-       /**
-        * Prepares links for the request.
-        *
-        * @since 6.1.0
-        *
-        * @param @param WP_Taxonomy $taxonomy The taxonomy.
-        * @return array Links for the given taxonomy.
-        */
-       protected function prepare_links( $taxonomy ) {
-               return array(
-                       'collection'              => array(
-                               'href' => rest_url( sprintf( '%s/%s', $this->namespace, $this->rest_base ) ),
-                       ),
-                       'https://api.w.org/items' => array(
-                               'href' => rest_url( rest_get_route_for_taxonomy_items( $taxonomy->name ) ),
-                       ),
-               );
-       }
-
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>

</body>
</html>