From e552b77739cc5f765a2d1d667351fe3c3af993b4 Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Wed, 21 Oct 2015 23:06:30 +0000 Subject: [PATCH] Revert [34352], pending investigation. See #34299 Built from https://develop.svn.wordpress.org/trunk@35349 git-svn-id: http://core.svn.wordpress.org/trunk@35315 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/rest-api/rest-functions.php | 7 ------- wp-includes/version.php | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/wp-includes/rest-api/rest-functions.php b/wp-includes/rest-api/rest-functions.php index d80e83985e..947efce90e 100644 --- a/wp-includes/rest-api/rest-functions.php +++ b/wp-includes/rest-api/rest-functions.php @@ -254,13 +254,6 @@ function get_rest_url( $blog_id = null, $path = '/', $scheme = 'rest' ) { $url = add_query_arg( 'rest_route', $path, $url ); } - if ( is_ssl() ) { - // If the current host is the same as the REST URL host, force the REST URL scheme to HTTPS - if ( $_SERVER['SERVER_NAME'] === parse_url( get_home_url( $blog_id ), PHP_URL_HOST ) ) { - $url = set_url_scheme( $url, 'https' ); - } - } - /** * Filter the REST URL. * diff --git a/wp-includes/version.php b/wp-includes/version.php index 76f4c31d20..8bcbcd79aa 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-35348'; +$wp_version = '4.4-alpha-35349'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.