Ticket #30566: fix-notice-with-tests-2.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

@@ -877 +877 @@
                 $this->assertFalse( $site );
         }
 
+
+        /**
+         * Tests returning an address for both invalid and valid ids and that the appropriate responses occur.
+         *
+         */
+        function test_get_blogaddress_by_id() {
+                $user_id = $this->factory->user->create( array( 'roler' => 'administrator' ) );
+                $blog_id = $this->factory->blog->create( array( 'user_id' => $user_id,  'path' => '/testdomainexists', 'title' => 'Test Title' ) );
+
+                // Test valid id.
+                $blogaddress = get_blogaddress_by_id( $blog_id );
+                $this->assertEquals( $blogaddress,  'http://example.org/testdomainexists/' );
+
+                //Test invalid id.
+                $invalidblogaddress = get_blogaddress_by_id( 999 );
+                $this->assertEquals( $invalidblogaddress, '' );
+        }
+
+
+
         /**
          * Test the original and cached responses for a created and then deleted site when
          * the blog ID is requested through get_blog_id_from_url().
@@ -1121 +1141 @@
         }
 }
 
-endif;
- No newline at end of file
+endif;