Changeset 31157 for trunk/src/wp-includes/ms-blogs.php

Timestamp:

01/12/2015 02:23:43 AM (11 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.

File:

• trunk/src/wp-includes/ms-blogs.php (modified) (1 diff)

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 ) : '';
 }