WordPress 4.5

[autoinstalls/wordpress.git] / wp-admin / network / site-info.php

diff --git a/wp-admin/network/site-info.php b/wp-admin/network/site-info.php
index 634e032379299f56764d460bf90997dc5f24385d..b18d804438fd2291b90aa0df206ad7c4b2420c81 100644 (file)
--- a/wp-admin/network/site-info.php
+++ b/wp-admin/network/site-info.php
@@ -78,6 +78,11 @@ if ( isset( $_REQUEST['action'] ) && 'update-site' == $_REQUEST['action'] ) {
                }
                $update_parsed_url = parse_url( $blog_data['url'] );
 
+               // If a path is not provided, use the default of `/`.
+               if ( ! isset( $update_parsed_url['path'] ) ) {
+                       $update_parsed_url['path'] = '/';
+               }
+
                $blog_data['scheme'] = $update_parsed_url['scheme'];
                $blog_data['domain'] = $update_parsed_url['host'];
                $blog_data['path'] = $update_parsed_url['path'];
@@ -138,7 +143,7 @@ require( ABSPATH . 'wp-admin/admin-header.php' );
 <div class="wrap">
 <h1 id="edit-site"><?php echo $title; ?></h1>
 <p class="edit-site-actions"><a href="<?php echo esc_url( get_home_url( $id, '/' ) ); ?>"><?php _e( 'Visit' ); ?></a> | <a href="<?php echo esc_url( get_admin_url( $id ) ); ?>"><?php _e( 'Dashboard' ); ?></a></p>
-<h2 class="nav-tab-wrapper nav-tab-small">
+<h2 class="nav-tab-wrapper nav-tab-small wp-clearfix">
 <?php
 $tabs = array(
        'site-info'     => array( 'label' => __( 'Info' ),     'url' => 'site-info.php'     ),
@@ -167,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; ?>