From 37c20547789a86d08a9a595f15110b45133dfed4 Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Fri, 30 Oct 2015 21:39:25 +0000 Subject: [PATCH] Remove trailing whitespace introduced in [35351]. Props rachelbaker Unprops johnbillion Fixes #34512 Built from https://develop.svn.wordpress.org/trunk@35462 git-svn-id: http://core.svn.wordpress.org/trunk@35426 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/rest-api/rest-functions.php | 12 ++++++------ wp-includes/version.php | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/wp-includes/rest-api/rest-functions.php b/wp-includes/rest-api/rest-functions.php index 90bb2e7305..f4bc96df51 100644 --- a/wp-includes/rest-api/rest-functions.php +++ b/wp-includes/rest-api/rest-functions.php @@ -254,12 +254,12 @@ 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' ); - } - } + 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 f3a8a41bc0..acc852ac47 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-beta2-35461'; +$wp_version = '4.4-beta2-35462'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.