Ticket #37297: 37297.diff

src/wp-activate.php

@@ -125 +125 @@
                                 <?php
                         }
                 } else {
-                        $url = isset( $result['blog_id'] ) ? get_blogaddress_by_id( (int) $result['blog_id'] ) : '';
+                        $url = isset( $result['blog_id'] ) ? get_home_url( (int) $result['blog_id'] ) : '';
                         $user = get_userdata( (int) $result['user_id'] );
                         ?>
                         <h2><?php _e('Your account is now active!'); ?></h2>

src/wp-includes/deprecated.php

@@ -3757 +3757 @@
 
         return '';
 }
+
+/**
+ * Get a full blog URL, given a blog id.
+ *
+ * @since MU
+ * @deprecated 4.7.0
+ *
+ * @param int $blog_id Blog ID
+ * @return string Full URL of the blog if found. Empty string if not.
+ */
+function get_blogaddress_by_id( $blog_id ) {
+        _deprecated_function( __FUNCTION__, '4.7.0' );
+
+        $blog_id = (int)$blog_id;
+        $bloginfo = get_site($blog_id);
+
+        if ( empty( $bloginfo ) ) {
+                return '';
+        }
+
+        $scheme = parse_url( $bloginfo->home, PHP_URL_SCHEME );
+        $scheme = empty( $scheme ) ? 'http' : $scheme;
+
+        return esc_url( $scheme . '://' . $bloginfo->domain . $bloginfo->path );
+}

src/wp-includes/ms-blogs.php

@@ -29 +29 @@
         do_action( 'wpmu_blog_updated', $wpdb->blogid );
 }
 
-/**
- * Get a full blog URL, given a blog id.
- *
- * @since MU
- *
- * @param int $blog_id Blog ID
- * @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 );
 
-        if ( empty( $bloginfo ) ) {
-                return '';
-        }
-
-        $scheme = parse_url( $bloginfo->home, PHP_URL_SCHEME );
-        $scheme = empty( $scheme ) ? 'http' : $scheme;
-
-        return esc_url( $scheme . '://' . $bloginfo->domain . $bloginfo->path );
-}
-
 /**
  * Get a full blog URL, given a blog name.
  *

src/wp-includes/ms-functions.php

@@ -1346 +1346 @@
                 die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p></body></html>' );
         $wpdb->suppress_errors( $suppress );
 
-        $url = get_blogaddress_by_id( $blog_id );
+        $url = get_home_url( $blog_id );
 
         // Set everything up
         make_db_current_silent( 'blog' );
@@ -1467 +1467 @@
 --The Team @ SITE_NAME' );
         }
 
-        $url = get_blogaddress_by_id($blog_id);
+        $url = get_home_url($blog_id);
         $user = get_userdata( $user_id );
 
         $welcome_email = str_replace( 'SITE_NAME', $current_site->site_name, $welcome_email );