Changeset 35446 for trunk/src/wp-includes/ms-blogs.php

Timestamp:

10/30/2015 02:01:32 AM (9 years ago)

Author:

johnbillion

Message:

Ensure that the scheme used in the URL returned by get_blogaddress_by_id() always reflects the blog's URL, instead of using http.

Props thomaswm
Fixes #14867

File:

• trunk/src/wp-includes/ms-blogs.php (modified) (2 diffs)

trunk/src/wp-includes/ms-blogs.php

@@ -39 +39 @@
  */
 function get_blogaddress_by_id( $blog_id ) {
-    $bloginfo = get_blog_details( (int) $blog_id, false ); // only get bare details!
-    return ( $bloginfo ) ? esc_url( 'http://' . $bloginfo->domain . $bloginfo->path ) : '';
+    $bloginfo = get_blog_details( (int) $blog_id );
+
+    if ( empty( $bloginfo ) ) {
+        return '';
+    }
+
+    $scheme = parse_url( $bloginfo->home, PHP_URL_SCHEME );
+    $scheme = empty( $scheme ) ? 'http' : $scheme;
+
+    return esc_url( $scheme . '://' . $bloginfo->domain . $bloginfo->path );
 }
 
@@ -217 +225 @@
 
     switch_to_blog( $blog_id );
-    $details->blogname      = get_option( 'blogname' );
-    $details->siteurl       = get_option( 'siteurl' );
-    $details->post_count    = get_option( 'post_count' );
+    $details->blogname   = get_option( 'blogname' );
+    $details->siteurl    = get_option( 'siteurl' );
+    $details->post_count = get_option( 'post_count' );
+    $details->home       = get_option( 'home' );
     restore_current_blog();