Changeset 21937 for trunk/wp-includes/link-template.php

Timestamp:

09/21/2012 12:36:50 PM (12 years ago)

Author:

ryan

Message:

Honor https in home option.

fixes #20759

File:

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

trunk/wp-includes/link-template.php

@@ -1893 +1893 @@
     $orig_scheme = $scheme;
 
-    if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) )
-        $scheme = is_ssl() && !is_admin() ? 'https' : 'http';
-
     if ( empty( $blog_id ) || !is_multisite() ) {
         $url = get_option( 'home' );
@@ -1902 +1899 @@
         $url = get_option( 'home' );
         restore_current_blog();
+    }
+
+    if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
+        if ( is_ssl() && ! is_admin() )
+            $scheme = 'https';
+        else
+            $scheme = parse_url( $url, PHP_URL_SCHEME );
     }