From fc8691778c41e5701bed835a22f325203a15d668 Mon Sep 17 00:00:00 2001
From: Jeremy Felt <jeremy.felt@gmail.com>
Date: Wed, 24 Feb 2016 16:06:26 +0000
Subject: [PATCH] Multisite: Show the main site's domain and path in
 site-info.php

* Use the domain and path combination from `wp_blogs` when displaying the site address for the main site.\
* Update the text from "Site URL" to "Site Address (URL)" for all sites in `site-info.php` to better align with how we refer to this in single site.

Props flixos90, rachelbaker.
Fixes #35632.

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


git-svn-id: http://core.svn.wordpress.org/trunk@36649 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/network/site-info.php | 6 +++---
 wp-includes/version.php        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wp-admin/network/site-info.php b/wp-admin/network/site-info.php
index c8874a77cd..b18d804438 100644
--- a/wp-admin/network/site-info.php
+++ b/wp-admin/network/site-info.php
@@ -172,14 +172,14 @@ if ( ! empty( $messages ) ) {
 		// The main site of the network should not be updated on this page.
 		if ( $is_main_site ) : ?>
 		<tr class="form-field">
-			<th scope="row"><?php _e( 'Site URL' ); ?></th>
-			<td><?php echo esc_url( $details->siteurl ); ?></td>
+			<th scope="row"><?php _e( 'Site Address (URL)' ); ?></th>
+			<td><?php echo esc_url( $details->domain . $details->path ); ?></td>
 		</tr>
 		<?php
 		// For any other site, the scheme, domain, and path can all be changed.
 		else : ?>
 		<tr class="form-field form-required">
-			<th scope="row"><?php _e( 'Site URL' ); ?></th>
+			<th scope="row"><?php _e( 'Site Address (URL)' ); ?></th>
 			<td><input name="blog[url]" type="text" id="url" value="<?php echo $parsed_scheme . '://' . esc_attr( $details->domain ) . esc_attr( $details->path ); ?>" /></td>
 		</tr>
 		<?php endif; ?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 74be617709..681d3012a7 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36681';
+$wp_version = '4.5-alpha-36682';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.