Ticket #30566: fix-notice-with-tests-4.30566.diff

src/wp-includes/ms-blogs.php

@@ -37 +37 @@
  */
 function get_blogaddress_by_id( $blog_id ) {
         $bloginfo = get_blog_details( (int) $blog_id, false ); // only get bare details!
-        return esc_url( 'http://' . $bloginfo->domain . $bloginfo->path );
+        return isset( $bloginfo->domain ) && isset( $bloginfo->path ) ?  esc_url( 'http://' . $bloginfo->domain . $bloginfo->path ) : '';
 }
 
 /**

tests/phpunit/tests/multisite/site.php

@@ -332 +332 @@
                 $result = update_blog_details( 999, array( 'domain' => 'example.com' ) );
                 $this->assertFalse( $result );
         }
-        
+
         function test_update_blog_details() {
                 $blog_id = $this->factory->blog->create();
 
@@ -1388 +1388 @@
 
                 remove_filter( 'domain_exists', array( $this, '_domain_exists_cb' ), 10, 4 );
         }
+
+
+
+        /**
+         * Tests returning an address for a given valid id.
+         */
+        function test_get_blogaddress_by_id_with_valid_id() {
+                $blogaddress = get_blogaddress_by_id( 1 );
+                $this->assertEquals( $blogaddress, 'http://example.org/' );
+        }
+
+
+        /**
+         * Tests returning the appropriate response for a invalid id given.
+         */
+        function test_get_blogaddress_by_id_with_invalid_id() {
+                $blogaddress = get_blogaddress_by_id( 42 );
+                $this->assertEquals( '', $blogaddress );
+        }
 }
 
-endif;
- No newline at end of file
+endif;