Changeset 38790

Timestamp:

10/14/2016 07:29:08 PM (3 years ago)

Author:

rachelbaker

Message:

REST API: Support sites with index-style permalinks in get_rest_url().

Support the index-style permalinks (​http://example.com/index.php/postName) when registering the REST API rewrite rules and within the get_rest_url() function. This allows sites that do not have mod_rewrite support to have almost pretty urls and have access to their REST API endpoints.

Props kraftbj.
Fixes #38182.

Location:

trunk

Files:

• src/wp-includes/rest-api.php (modified) (3 diffs)
• tests/phpunit/tests/rest-api.php (modified) (1 diff)

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

@@ -92 +92 @@
  *
  * @see add_rewrite_rule()
+ * @global WP_Rewrite $wp_rewrite
  */
 function rest_api_register_rewrites() {
+    global $wp_rewrite;
+
     add_rewrite_rule( '^' . rest_get_url_prefix() . '/?$','index.php?rest_route=/','top' );
     add_rewrite_rule( '^' . rest_get_url_prefix() . '/(.*)?','index.php?rest_route=/$matches[1]','top' );
+    add_rewrite_rule( '^' . $wp_rewrite->index . '/' . rest_get_url_prefix() . '/?$','index.php?rest_route=/','top' );
+    add_rewrite_rule( '^' . $wp_rewrite->index . '/' . rest_get_url_prefix() . '/(.*)?','index.php?rest_route=/$matches[1]','top' );
 }
 
@@ -177 +182 @@
  *
  * @todo Check if this is even necessary
+ * @global WP_Rewrite $wp_rewrite
  *
  * @param int    $blog_id Optional. Blog ID. Default of null returns URL for current blog.
@@ -189 +195 @@
 
     if ( is_multisite() && get_blog_option( $blog_id, 'permalink_structure' ) || get_option( 'permalink_structure' ) ) {
-        $url = get_home_url( $blog_id, rest_get_url_prefix(), $scheme );
+        global $wp_rewrite;
+
+        if ( $wp_rewrite->using_index_permalinks() ) {
+            $url = get_home_url( $blog_id, $wp_rewrite->index . '/' . rest_get_url_prefix(), $scheme );
+        } else {
+            $url = get_home_url( $blog_id, rest_get_url_prefix(), $scheme );
+        }
+
         $url .= '/' . ltrim( $path, '/' );
     } else {

trunk/tests/phpunit/tests/rest-api.php

@@ -276 +276 @@
     public function test_rest_url_generation() {
         // In pretty permalinks case, we expect a path of wp-json/ with no query.
-        update_option( 'permalink_structure', '/%year%/%monthnum%/%day%/%postname%/' );
+        $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
         $this->assertEquals( 'http://' . WP_TESTS_DOMAIN . '/wp-json/', get_rest_url() );
 
-        update_option( 'permalink_structure', '' );
+        // In index permalinks case, we expect a path of index.php/wp-json/ with no query.
+        $this->set_permalink_structure( '/index.php/%year%/%monthnum%/%day%/%postname%/' );
+        $this->assertEquals( 'http://' . WP_TESTS_DOMAIN . '/index.php/wp-json/', get_rest_url() );
+
         // In non-pretty case, we get a query string to invoke the rest router.
+        $this->set_permalink_structure( '' );
         $this->assertEquals( 'http://' . WP_TESTS_DOMAIN . '/?rest_route=/', get_rest_url() );