From a6f0fb6d2a4296da148a0a416c593a67404acc48 Mon Sep 17 00:00:00 2001 From: Rachel Baker Date: Fri, 14 Oct 2016 19:30:29 +0000 Subject: [PATCH] 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. Built from https://develop.svn.wordpress.org/trunk@38790 git-svn-id: http://core.svn.wordpress.org/trunk@38733 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/rest-api.php | 15 ++++++++++++++- wp-includes/version.php | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/wp-includes/rest-api.php b/wp-includes/rest-api.php index 0eee75c772..620ca925b9 100644 --- a/wp-includes/rest-api.php +++ b/wp-includes/rest-api.php @@ -91,10 +91,15 @@ function rest_api_init() { * @since 4.4.0 * * @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' ); } /** @@ -176,6 +181,7 @@ function rest_get_url_prefix() { * @since 4.4.0 * * @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. * @param string $path Optional. REST route. Default '/'. @@ -188,7 +194,14 @@ function get_rest_url( $blog_id = null, $path = '/', $scheme = 'rest' ) { } 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 { $url = trailingslashit( get_home_url( $blog_id, '', $scheme ) ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 61b8389233..30480f91ce 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.7-alpha-38789'; +$wp_version = '4.7-alpha-38790'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.