Changeset 39923

Timestamp:

01/17/2017 05:39:15 AM (8 years ago)

Author:

rmccue

Message:

REST API: Correctly serve the index with PATH_INFO

When hitting the index, untrailingslashit() would make the REST route empty, which would then use the fallback inside WP_REST_Server. This isn't a problem most of the time, but WP_REST_Server contains a fallback to PATH_INFO. Combined with PATH_INFO permalinks, this would give a 404 on the API index, as it attempts to look up a route for "/wp-json/".

Props ccprog.
Fixes #39432.

File:

• trunk/src/wp-includes/rest-api.php (modified) (1 diff)

trunk/src/wp-includes/rest-api.php

@@ -257 +257 @@
 
     // Fire off the request.
-    $server->serve_request( untrailingslashit( $GLOBALS['wp']->query_vars['rest_route'] ) );
+    $route = untrailingslashit( $GLOBALS['wp']->query_vars['rest_route'] );
+    if ( empty( $route ) ) {
+        $route = '/';
+    }
+    $server->serve_request( $route );
 
     // We're done.