WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jeremy Felt 2016-02-24 16:06:26 +00:00
parent 34331fc574
commit fc8691778c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/network/site-info.php
View File

@ -172,14 +172,14 @@ if ( ! empty( $messages ) ) {
// The main site of the network should not be updated on this page. // The main site of the network should not be updated on this page.
if ( $is_main_site ) : ?> if ( $is_main_site ) : ?>
<tr class="form-field"> <tr class="form-field">
<th scope="row"><?php _e( 'Site URL' ); ?></th> <th scope="row"><?php _e( 'Site Address (URL)' ); ?></th>
<td><?php echo esc_url( $details->siteurl ); ?></td> <td><?php echo esc_url( $details->domain . $details->path ); ?></td>
</tr> </tr>
<?php <?php
// For any other site, the scheme, domain, and path can all be changed. // For any other site, the scheme, domain, and path can all be changed.
else : ?> else : ?>
<tr class="form-field form-required"> <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> <td><input name="blog[url]" type="text" id="url" value="<?php echo $parsed_scheme . '://' . esc_attr( $details->domain ) . esc_attr( $details->path ); ?>" /></td>
</tr> </tr>
<?php endif; ?> <?php endif; ?>

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.