From 23b015ed48970dc969624cd6a4909c4db6aa949d Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 2 Feb 2021 20:59:05 +0000 Subject: [PATCH] General: Remove admin exception for `https` in `network_home_url()`. Previously, `network_home_url()` would automatically switch to `https` if the current request is already `https`, but would only do so on the front end. This mirrors the change made earlier for `get_home_url()`. Follow-up to [12598], [21937], [24844], [50156]. See #52421. Built from https://develop.svn.wordpress.org/trunk@50168 git-svn-id: http://core.svn.wordpress.org/trunk@49847 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/link-template.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php index 64024b1166..5bbfc53c60 100644 --- a/wp-includes/link-template.php +++ b/wp-includes/link-template.php @@ -3590,7 +3590,7 @@ function network_home_url( $path = '', $scheme = null ) { $orig_scheme = $scheme; if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ), true ) ) { - $scheme = is_ssl() && ! is_admin() ? 'https' : 'http'; + $scheme = is_ssl() ? 'https' : 'http'; } if ( 'relative' === $scheme ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index 8a5ebbf989..986ef783d9 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.7-alpha-50167'; +$wp_version = '5.7-alpha-50168'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.