Changeset 43771 for branches/5.0/src/wp-includes/js

Timestamp:

10/19/2018 06:32:03 PM (8 years ago)

Author:

danielbachhuber

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.
Merges [42965] to the 5.0 branch.
Fixes #42382.

Location:

branches/5.0

Files:

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

branches/5.0/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;
         }