Ticket #33041: with-test.diff

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 ) : '';
+        return ( $bloginfo ) ? esc_url( set_url_scheme( 'http://' . $bloginfo->domain . $bloginfo->path ) ) : '';
 }
 
 /**

tests/phpunit/tests/multisite/site.php

@@ -1180 +1180 @@
         }
 
         /**
+         * Tests returning an address for a given valid id on a https setup
+         *
+         * @backupGlobals enabled
+         */
+        function test_get_blogaddress_by_id_with_valid_id_https() {
+                $_SERVER['HTTPS'] = 'on';
+                $blogaddress = get_blogaddress_by_id( 1 );
+                $this->assertEquals( 'https://' . WP_TESTS_DOMAIN . '/', $blogaddress );
+        }
+
+        /**
          * Tests returning the appropriate response for a invalid id given.
          */
         function test_get_blogaddress_by_id_with_invalid_id() {