Changeset 31157

Timestamp:

01/12/2015 02:23:43 AM (10 years ago)

Author:

jeremyfelt

Message:

Check for existence of data from get_blogaddress_by_id() before returning a URL

• Prevent a notice when an invalid ID is used with get_blogaddres_by_id().
• Return a falsy empty string rather than the previous "​http://".
• Add unit tests for get_blogaddress_by_id().

Props nerrad.

Fixes #30566.

Location:

trunk

Files:

• src/wp-includes/ms-blogs.php (modified) (1 diff)
• tests/phpunit/tests/multisite/site.php (modified) (2 diffs)

trunk/src/wp-includes/ms-blogs.php

@@ -34 +34 @@
  *
  * @param int $blog_id Blog ID
- * @return string
+ * @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 esc_url( 'http://' . $bloginfo->domain . $bloginfo->path );
+    return isset( $bloginfo->domain ) && isset( $bloginfo->path ) ?  esc_url( 'http://' . $bloginfo->domain . $bloginfo->path ) : '';
 }
 

trunk/tests/phpunit/tests/multisite/site.php

@@ -333 +333 @@
         $this->assertFalse( $result );
     }
-    
+
     function test_update_blog_details() {
         $blog_id = $this->factory->blog->create();
@@ -1462 +1462 @@
         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( 'http://example.org/', $blogaddress );
+    }
+
+    /**
+     * 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 );
+    }
 }