Changeset 42965

Timestamp:

04/09/2018 01:09:41 PM (7 years ago)

Author:

adamsilverstein

Message:

REST API: Handle api-request query parameters with plain permalinks.

When constructing the request URL, ensure that ? is replaced with & when the API root already contains a ?. Fixes an issue where requests were broken when sites had permalinks set to plain.

Props aduth.
Fixes #42382.

Location:

trunk

Files:

• src/wp-includes/js/api-request.js (modified) (2 diffs)
• tests/qunit/wp-includes/js/api-request.js (modified) (1 diff)

trunk/src/wp-includes/js/api-request.js

@@ -23 +23 @@
         var url = options.url;
         var path = options.path;
-        var namespaceTrimmed, endpointTrimmed;
+        var namespaceTrimmed, endpointTrimmed, apiRoot;
         var headers, addNonceHeader, headerName;
 
@@ -39 +39 @@
         }
         if ( typeof path === 'string' ) {
-            url = wpApiSettings.root + path.replace( /^\//, '' );
+            apiRoot = wpApiSettings.root;
+            path = path.replace( /^\//, '' );
+
+            // API root may already include query parameter prefix if site is
+            // configured to use plain permalinks.
+            if ( 'string' === typeof apiRoot && -1 !== apiRoot.indexOf( '?' ) ) {
+                path = path.replace( '?', '&' );
+            }
+
+            url = apiRoot + path;
         }
 

trunk/tests/qunit/wp-includes/js/api-request.js

@@ -141 +141 @@
             assert.deepEqual( wp.apiRequest.buildAjaxOptions( {
                 namespace: '/wp/v2/',
-                endpoint: '/posts'
+                endpoint: '/posts?orderby=title'
             } ), {
-                url: 'http://localhost/index.php?rest_route=/wp/v2/posts',
+                url: 'http://localhost/index.php?rest_route=/wp/v2/posts&orderby=title',
                 headers: nonceHeader
             } );