<!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>[49716] trunk: Site Health, App Passwords: Ensure REST API responses are properly translated.</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/49716">49716</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/49716","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>TimothyBlynJacobs</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-12-01 03:42:31 +0000 (Tue, 01 Dec 2020)</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'>Site Health, App Passwords: Ensure REST API responses are properly translated.
The REST API requests in Site Health and App Passwords now include `_locale=user` in the request URL to ensure the user's locale is used instead of the site locale. Additionally, the `apiRequest` library now sends a JSON `Accept` header which is required by `determine_locale()` to respect the `_locale` query parameter.
The Site Health REST API controllers now manually load the default admin textdomain if not `is_admin()`. This allows for the Site Health tests to be translated even though the translations are part of the administration project and the REST API is not.
Props oglekler, kebbet, Clorith, TimothyBlynJacobs, ocean90, SergeyBiryukov, adamsilverstein.
Fixes <a href="https://core.trac.wordpress.org/ticket/51871">#51871</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueuesadminapplicationpasswordsjs">trunk/src/js/_enqueues/admin/application-passwords.js</a></li>
<li><a href="#trunksrcjs_enqueuesadminauthappjs">trunk/src/js/_enqueues/admin/auth-app.js</a></li>
<li><a href="#trunksrcjs_enqueuesadminsitehealthjs">trunk/src/js/_enqueues/admin/site-health.js</a></li>
<li><a href="#trunksrcjs_enqueueswpapirequestjs">trunk/src/js/_enqueues/wp/api-request.js</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestsitehealthcontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-site-health-controller.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
<li><a href="#trunktestsqunitwpincludesjsapirequestjs">trunk/tests/qunit/wp-includes/js/api-request.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueuesadminapplicationpasswordsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/application-passwords.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/application-passwords.js 2020-11-30 17:30:02 UTC (rev 49715)
+++ trunk/src/js/_enqueues/admin/application-passwords.js 2020-12-01 03:42:31 UTC (rev 49716)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,7 +47,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> request = wp.hooks.applyFilters( 'wp_application_passwords_new_password_request', request, userId );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp.apiRequest( {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- path: '/wp/v2/users/' + userId + '/application-passwords',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ path: '/wp/v2/users/' + userId + '/application-passwords?_locale=user',
</ins><span class="cx" style="display: block; padding: 0 10px"> method: 'POST',
</span><span class="cx" style="display: block; padding: 0 10px"> data: request
</span><span class="cx" style="display: block; padding: 0 10px"> } ).always( function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +94,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $submitButton.prop( 'disabled', true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp.apiRequest( {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- path: '/wp/v2/users/' + userId + '/application-passwords/' + uuid,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ path: '/wp/v2/users/' + userId + '/application-passwords/' + uuid + '?_locale=user',
</ins><span class="cx" style="display: block; padding: 0 10px"> method: 'DELETE'
</span><span class="cx" style="display: block; padding: 0 10px"> } ).always( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> $submitButton.prop( 'disabled', false );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,7 +123,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $submitButton.prop( 'disabled', true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp.apiRequest( {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- path: '/wp/v2/users/' + userId + '/application-passwords',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ path: '/wp/v2/users/' + userId + '/application-passwords?_locale=user',
</ins><span class="cx" style="display: block; padding: 0 10px"> method: 'DELETE'
</span><span class="cx" style="display: block; padding: 0 10px"> } ).always( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> $submitButton.prop( 'disabled', false );
</span></span></pre></div>
<a id="trunksrcjs_enqueuesadminauthappjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/auth-app.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/auth-app.js 2020-11-30 17:30:02 UTC (rev 49715)
+++ trunk/src/js/_enqueues/admin/auth-app.js 2020-12-01 03:42:31 UTC (rev 49716)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> request = wp.hooks.applyFilters( 'wp_application_passwords_approve_app_request', request, context );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp.apiRequest( {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- path: '/wp/v2/users/me/application-passwords',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ path: '/wp/v2/users/me/application-passwords?_locale=user',
</ins><span class="cx" style="display: block; padding: 0 10px"> method: 'POST',
</span><span class="cx" style="display: block; padding: 0 10px"> data: request
</span><span class="cx" style="display: block; padding: 0 10px"> } ).done( function( response, textStatus, jqXHR ) {
</span></span></pre></div>
<a id="trunksrcjs_enqueuesadminsitehealthjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/site-health.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/site-health.js 2020-11-30 17:30:02 UTC (rev 49715)
+++ trunk/src/js/_enqueues/admin/site-health.js 2020-12-01 03:42:31 UTC (rev 49716)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,7 +271,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'undefined' !== typeof( this.has_rest ) && this.has_rest ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp.apiRequest( {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- url: this.test,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ url: wp.url.addQueryArgs( this.test, { _locale: 'user' } ),
</ins><span class="cx" style="display: block; padding: 0 10px"> headers: this.headers
</span><span class="cx" style="display: block; padding: 0 10px"> } )
</span><span class="cx" style="display: block; padding: 0 10px"> .done( function( response ) {
</span></span></pre></div>
<a id="trunksrcjs_enqueueswpapirequestjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/api-request.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/api-request.js 2020-11-30 17:30:02 UTC (rev 49715)
+++ trunk/src/js/_enqueues/wp/api-request.js 2020-12-01 03:42:31 UTC (rev 49716)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,6 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.6.0 Added overriding of the "PUT" and "DELETE" methods with "POST".
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Added an "application/json" Accept header to all requests.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @output wp-includes/js/api-request.js
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,7 +27,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var path = options.path;
</span><span class="cx" style="display: block; padding: 0 10px"> var method = options.method;
</span><span class="cx" style="display: block; padding: 0 10px"> var namespaceTrimmed, endpointTrimmed, apiRoot;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var headers, addNonceHeader, headerName;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var headers, addNonceHeader, addAcceptHeader, headerName;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="cx" style="display: block; padding: 0 10px"> typeof options.namespace === 'string' &&
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,20 +56,25 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If ?_wpnonce=... is present, no need to add a nonce header.
</span><span class="cx" style="display: block; padding: 0 10px"> addNonceHeader = ! ( options.data && options.data._wpnonce );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ addAcceptHeader = true;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> headers = options.headers || {};
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If an 'X-WP-Nonce' header (or any case-insensitive variation
- // thereof) was specified, no need to add a nonce header.
- if ( addNonceHeader ) {
- for ( headerName in headers ) {
- if ( headers.hasOwnProperty( headerName ) ) {
- if ( headerName.toLowerCase() === 'x-wp-nonce' ) {
- addNonceHeader = false;
- break;
- }
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ for ( headerName in headers ) {
+ if ( ! headers.hasOwnProperty( headerName ) ) {
+ continue;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // If an 'X-WP-Nonce' or 'Accept' header (or any case-insensitive variation
+ // thereof) was specified, no need to add the header again.
+ switch ( headerName.toLowerCase() ) {
+ case 'x-wp-nonce':
+ addNonceHeader = false;
+ break;
+ case 'accept':
+ addAcceptHeader = false;
+ break;
+ }
</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"> if ( addNonceHeader ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,6 +84,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }, headers );
</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">+ if ( addAcceptHeader ) {
+ headers = $.extend( {
+ 'Accept': 'application/json, */*;q=0.1'
+ }, headers );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( typeof method === 'string' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> method = method.toUpperCase();
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestsitehealthcontrollerphp"></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-site-health-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-site-health-controller.php 2020-11-30 17:30:02 UTC (rev 49715)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-site-health-controller.php 2020-12-01 03:42:31 UTC (rev 49716)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,6 +171,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_background_updates() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->load_admin_textdomain();
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->site_health->get_test_background_updates();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,6 +183,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_dotorg_communication() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->load_admin_textdomain();
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->site_health->get_test_dotorg_communication();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,6 +195,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_loopback_requests() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->load_admin_textdomain();
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->site_health->get_test_loopback_requests();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,6 +207,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_authorization_header() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->load_admin_textdomain();
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->site_health->get_test_authorization_header();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,6 +223,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/includes/class-wp-debug-data.php';
</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">+ $this->load_admin_textdomain();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $sizes_data = WP_Debug_Data::get_sizes();
</span><span class="cx" style="display: block; padding: 0 10px"> $all_sizes = array( 'raw' => 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,6 +263,22 @@
</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">+ * Loads the admin textdomain for Site Health tests.
+ *
+ * The {@see WP_Site_Health} class is defined in WP-Admin, while the REST API operates in a front-end context.
+ * This means that the translations for Site Health won't be loaded by default in {@see load_default_textdomain()}.
+ *
+ * @since 5.6.0
+ */
+ protected function load_admin_textdomain() {
+ // Accounts for inner REST API requests in the admin.
+ if ( ! is_admin() ) {
+ $locale = determine_locale();
+ load_textdomain( 'default', WP_LANG_DIR . "/admin-$locale.mo" );
+ }
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Gets the schema for each site health test.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.6.0
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></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/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2020-11-30 17:30:02 UTC (rev 49715)
+++ trunk/src/wp-includes/script-loader.php 2020-12-01 03:42:31 UTC (rev 49716)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1286,7 +1286,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery', 'jquery-ui-core', 'thickbox' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->set_translations( 'plugin-install' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $scripts->add( 'site-health', "/wp-admin/js/site-health$suffix.js", array( 'clipboard', 'jquery', 'wp-util', 'wp-a11y', 'wp-api-request' ), false, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scripts->add( 'site-health', "/wp-admin/js/site-health$suffix.js", array( 'clipboard', 'jquery', 'wp-util', 'wp-a11y', 'wp-api-request', 'wp-url' ), false, 1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $scripts->set_translations( 'site-health' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'privacy-tools', "/wp-admin/js/privacy-tools$suffix.js", array( 'jquery', 'wp-a11y' ), false, 1 );
</span></span></pre></div>
<a id="trunktestsqunitwpincludesjsapirequestjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/qunit/wp-includes/js/api-request.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/qunit/wp-includes/js/api-request.js 2020-11-30 17:30:02 UTC (rev 49715)
+++ trunk/tests/qunit/wp-includes/js/api-request.js 2020-12-01 03:42:31 UTC (rev 49716)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,7 +2,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ( function( QUnit ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var originalRootUrl = window.wpApiSettings.root;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var nonceHeader = { 'X-WP-Nonce': 'not_a_real_nonce' };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var expectedHeaders = {
+ 'X-WP-Nonce': 'not_a_real_nonce',
+ 'Accept': 'application/json, */*;q=0.1'
+ };
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> QUnit.module( 'wp-api-request', {
</span><span class="cx" style="display: block; padding: 0 10px"> afterEach: function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,6 +35,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> url: 'http://localhost/wp-json/wp/v2/posts',
</span><span class="cx" style="display: block; padding: 0 10px"> headers: {
</span><span class="cx" style="display: block; padding: 0 10px"> 'X-WP-Nonce': 'not_a_real_nonce',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Accept': 'application/json, */*;q=0.1',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'Header-Name': 'value'
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> data: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,11 +68,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var settings = wp.apiRequest.buildAjaxOptions( settingsOriginal );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> assert.notStrictEqual( settings, settingsOriginal );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- assert.strictEqual( settings.headers, settingsOriginal.headers );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var expected = {
+ Accept: 'application/json, */*;q=0.1'
+ };
+ expected[ headerName ] = nonceHeader[ headerName ];
+
</ins><span class="cx" style="display: block; padding: 0 10px"> assert.deepEqual( settings, {
</span><span class="cx" style="display: block; padding: 0 10px"> url: 'aaaa',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- headers: nonceHeader
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ headers: expected
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,7 +95,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> assert.deepEqual( settings, {
</span><span class="cx" style="display: block; padding: 0 10px"> url: 'aaaa',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- headers: {},
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ headers: {
+ 'Accept': 'application/json, */*;q=0.1'
+ },
</ins><span class="cx" style="display: block; padding: 0 10px"> data: {
</span><span class="cx" style="display: block; padding: 0 10px"> _wpnonce: 'definitely_not_a_real_nonce'
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,6 +104,19 @@
</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">+ QUnit.test( 'does not add accept header if already present', function( assert ) {
+ var settingsOriginal = {
+ url: 'aaaa',
+ headers: {
+ 'Accept': 'text/xml'
+ }
+ };
+
+ var settings = wp.apiRequest.buildAjaxOptions( settingsOriginal );
+
+ assert.strictEqual( settingsOriginal.headers.Accept, settings.headers.Accept );
+ } );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> QUnit.test( 'accepts namespace and endpoint', function( assert ) {
</span><span class="cx" style="display: block; padding: 0 10px"> assert.deepEqual( wp.apiRequest.buildAjaxOptions( {
</span><span class="cx" style="display: block; padding: 0 10px"> namespace: 'wp/v2',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +123,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> endpoint: 'posts'
</span><span class="cx" style="display: block; padding: 0 10px"> } ), {
</span><span class="cx" style="display: block; padding: 0 10px"> url: 'http://localhost/wp-json/wp/v2/posts',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- headers: nonceHeader
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ headers: expectedHeaders
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,7 +133,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> endpoint: '/posts'
</span><span class="cx" style="display: block; padding: 0 10px"> } ), {
</span><span class="cx" style="display: block; padding: 0 10px"> url: 'http://localhost/wp-json/wp/v2/posts',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- headers: nonceHeader
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ headers: expectedHeaders
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,7 +143,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> endpoint: ''
</span><span class="cx" style="display: block; padding: 0 10px"> } ), {
</span><span class="cx" style="display: block; padding: 0 10px"> url: 'http://localhost/wp-json/wp/v2',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- headers: nonceHeader
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ headers: expectedHeaders
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,7 +153,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> endpoint: ''
</span><span class="cx" style="display: block; padding: 0 10px"> } ), {
</span><span class="cx" style="display: block; padding: 0 10px"> url: 'http://localhost/wp-json/',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- headers: nonceHeader
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ headers: expectedHeaders
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,7 +166,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> endpoint: '/posts?orderby=title'
</span><span class="cx" style="display: block; padding: 0 10px"> } ), {
</span><span class="cx" style="display: block; padding: 0 10px"> url: 'http://localhost/index.php?rest_route=/wp/v2/posts&orderby=title',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- headers: nonceHeader
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ headers: expectedHeaders
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,7 +180,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> endpoint: ''
</span><span class="cx" style="display: block; padding: 0 10px"> } ), {
</span><span class="cx" style="display: block; padding: 0 10px"> url: 'http://localhost/index.php?rest_route=/',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- headers: nonceHeader
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ headers: expectedHeaders
</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>
</div>
</body>
</html>