From 1084773c1c401a102d2bc7b441981bc739b6040c Mon Sep 17 00:00:00 2001
From: Jeremy Felt <jeremy.felt@gmail.com>
Date: Tue, 27 Sep 2016 21:36:28 +0000
Subject: [PATCH] Multisite: Use `get_home_url()` instead of
 `get_blogaddress_by_id()` in `wp-activate.php`.

`get_home_url()` is a better fit for the "View your site" link and can be properly filtered. This is the last remaining use of `get_blogaddress_by_id()` in core.

Props boboudreau, spacedmonkey.
Fixes #26855.

Built from https://develop.svn.wordpress.org/trunk@38664


git-svn-id: http://core.svn.wordpress.org/trunk@38607 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-activate.php         | 2 +-
 wp-includes/version.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-activate.php b/wp-activate.php
index 0f6181a5d1..b13279af6b 100644
--- a/wp-activate.php
+++ b/wp-activate.php
@@ -125,7 +125,7 @@ get_header( 'wp-activate' );
 				<?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>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 03e8f7dc52..7e488af85d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38663';
+$wp_version = '4.7-alpha-38664';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.