Ticket #14867: 14867.2.diff

wp-includes/ms-blogs.php

@@ -38 +38 @@
  * @return string Full URL of the blog if found. Empty string if not.
  */
 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, true ); // get all details
+        if ( empty( $bloginfo ) ) {
+                return '';
+        }
+        
+        // Derive the site's scheme from its home URL 
+        $scheme = parse_url( $bloginfo->homeurl, PHP_URL_SCHEME );
+        $scheme = empty( $scheme ) ? 'http' : $scheme;
+        return esc_url( $scheme . '://' . $bloginfo->domain . $bloginfo->path ) : '';
 }
 
 /**
@@ -218 +225 @@
         switch_to_blog( $blog_id );
         $details->blogname              = get_option( 'blogname' );
         $details->siteurl               = get_option( 'siteurl' );
+        $details->homeurl               = get_option( 'home' );
         $details->post_count    = get_option( 'post_count' );
         restore_current_blog();