Changeset 50156 for trunk/src/wp-includes/link-template.php

Timestamp:

02/02/2021 07:01:18 PM (4 years ago)

Author:

SergeyBiryukov

Message:

General: Remove admin and login exceptions for https in get_home_url().

Previously, get_home_url() would automatically switch to https if the current request is already https, but would only do so on the front end.

This addresses the inconsistent behavior of returning different values in the admin and on the frontend.

Follow-up to [12598], [21937], [24844].

Props herregroen, mukesh27.
Fixes #52421.

File:

• trunk/src/wp-includes/link-template.php (modified) (3 diffs)

trunk/src/wp-includes/link-template.php

@@ -3254 +3254 @@
  * @since 3.0.0
  *
- * @global string $pagenow
- *
  * @param int         $blog_id Optional. Site ID. Default null (current site).
  * @param string      $path    Optional. Path relative to the home URL. Default empty.
@@ -3263 +3261 @@
  */
 function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
-    global $pagenow;
-
     $orig_scheme = $scheme;
 
@@ -3276 +3272 @@
 
     if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ), true ) ) {
-        if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $pagenow ) {
+        if ( is_ssl() ) {
             $scheme = 'https';
         } else {