Changeset 50156

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.

Location:

trunk

Files:

• src/wp-includes/link-template.php (modified) (3 diffs)
• tests/phpunit/tests/rest-api.php (modified) (1 diff)
• tests/phpunit/tests/url.php (modified) (2 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 {

trunk/tests/phpunit/tests/rest-api.php

@@ -790 +790 @@
         $_SERVER['HTTPS'] = 'on';
         $url              = get_rest_url();
-        $this->assertSame( 'http', parse_url( $url, PHP_URL_SCHEME ) );
+        $this->assertSame( 'https', parse_url( $url, PHP_URL_SCHEME ) );
 
         // Reset.

trunk/tests/phpunit/tests/url.php

@@ -204 +204 @@
         // Pretend to be in the site admin.
         set_current_screen( 'dashboard' );
-        $home = get_option( 'home' );
-
-        // home_url() should return http when in the admin.
-        $_SERVER['HTTPS'] = 'on';
-        $this->assertSame( $home, home_url() );
+        $home       = get_option( 'home' );
+        $home_https = str_replace( 'http://', 'https://', $home );
+
+        // is_ssl() should determine the scheme in the admin.
+        $_SERVER['HTTPS'] = 'on';
+        $this->assertSame( $home_https, home_url() );
 
         $_SERVER['HTTPS'] = 'off';
         $this->assertSame( $home, home_url() );
 
-        // If not in the admin, is_ssl() should determine the scheme.
+        // is_ssl() should determine the scheme on front end too.
         set_current_screen( 'front' );
         $this->assertSame( $home, home_url() );
-        $_SERVER['HTTPS'] = 'on';
-        $home             = str_replace( 'http://', 'https://', $home );
-        $this->assertSame( $home, home_url() );
+
+        $_SERVER['HTTPS'] = 'on';
+        $this->assertSame( $home_https, home_url() );
 
         // Test with https in home.
@@ -252 +253 @@
         // Pretend to be in the site admin.
         set_current_screen( 'dashboard' );
-        $home = network_home_url();
-
-        // home_url() should return http when in the admin.
+        $home       = network_home_url();
+        $home_https = str_replace( 'http://', 'https://', $home );
+
+        // is_ssl() should determine the scheme in the admin.
         $this->assertSame( 0, strpos( $home, 'http://' ) );
         $_SERVER['HTTPS'] = 'on';
-        $this->assertSame( $home, network_home_url() );
+        $this->assertSame( $home_https, network_home_url() );
 
         $_SERVER['HTTPS'] = 'off';
         $this->assertSame( $home, network_home_url() );
 
-        // If not in the admin, is_ssl() should determine the scheme.
+        // is_ssl() should determine the scheme on front end too.
         set_current_screen( 'front' );
         $this->assertSame( $home, network_home_url() );
         $_SERVER['HTTPS'] = 'on';
-        $home             = str_replace( 'http://', 'https://', $home );
-        $this->assertSame( $home, network_home_url() );
+        $this->assertSame( $home_https, network_home_url() );
 
         $GLOBALS['current_screen'] = $screen;