Ticket #14867: 14867.diff

wp-includes/ms-blogs.php

@@ -19 +19 @@
 }
 
 function get_blogaddress_by_id( $blog_id ) {
+        $protocol = is_ssl() ? ' https://' : ' http://';
         $bloginfo = get_blog_details( (int) $blog_id, false ); // only get bare details!
-        return esc_url( 'http://' . $bloginfo->domain . $bloginfo->path );
+        return esc_url( $protocol . $bloginfo->domain . $bloginfo->path );
 }
 
 function get_blogaddress_by_name( $blogname ) {
@@ -38 +39 @@
         return esc_url( $url . '/' );
 }
 
-function get_blogaddress_by_domain( $domain, $path ){
+function get_blogaddress_by_domain( $domain, $path ) {
+        $protocol = is_ssl() ? ' https://' : ' http://';
+
         if ( is_subdomain_install() ) {
-                $url = "http://".$domain.$path;
+                $url = $protocol.$domain.$path;
         } else {
                 if ( $domain != $_SERVER['HTTP_HOST'] ) {
                         $blogname = substr( $domain, 0, strpos( $domain, '.' ) );
-                        $url = 'http://' . substr( $domain, strpos( $domain, '.' ) + 1 ) . $path;
+                        $url = $protocol . substr( $domain, strpos( $domain, '.' ) + 1 ) . $path;
                         // we're not installing the main blog
                         if ( $blogname != 'www.' )
                                 $url .= $blogname . '/';
                 } else { // main blog
-                        $url = 'http://' . $domain . $path;
+                        $url = $protocol . $domain . $path;
                 }
         }
+
         return esc_url( $url );
 }