Ticket #22235: 22235.diff

diff --git wp-admin/network/site-info.php wp-admin/network/site-info.php
index bcc71f9..8071b25 100644
--- wp-admin/network/site-info.php
+++ wp-admin/network/site-info.php
@@ -49,8 +49,15 @@ if ( isset($_REQUEST['action']) && 'update-site' == $_REQUEST['action'] ) {
 
        switch_to_blog( $id );
 
+       $url_parts = parse_url( 'http://' . $_POST['blog']['url'] );
+       unset( $_POST['blog']['url'] );
+
+       $_POST['blog']['domain'] = $url_parts['host'];
+       $_POST['blog']['path'] = $url_parts['path'];
+
        if ( isset( $_POST['update_home_url'] ) && $_POST['update_home_url'] == 'update' ) {
                $blog_address = get_blogaddress_by_domain( $_POST['blog']['domain'], $_POST['blog']['path'] );
+
                if ( get_option( 'siteurl' ) != $blog_address )
                        update_option( 'siteurl', $blog_address );
 
@@ -74,6 +81,7 @@ if ( isset($_REQUEST['action']) && 'update-site' == $_REQUEST['action'] ) {
        update_blog_details( $id, $blog_data );
 
        restore_current_blog();
+
        wp_redirect( add_query_arg( array( 'update' => 'updated', 'id' => $id ), 'site-info.php') );
        exit;
 }
@@ -122,28 +130,24 @@ if ( ! empty( $messages ) ) {
        <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
        <table class="form-table">
                <tr class="form-field form-required">
-                       <th scope="row"><?php _e( 'Domain' ) ?></th>
+                       <th scope="row"><?php _e( 'URL' ) ?></th>
+                       <td>
                        <?php
                        $protocol = is_ssl() ? 'https://' : 'http://';
+
                        if ( $is_main_site ) { ?>
-                       <td><code><?php echo $protocol; echo esc_attr( $details->domain ) ?></code></td>
-                       <?php } else { ?>
-                       <td><?php echo $protocol; ?><input name="blog[domain]" type="text" id="domain" value="<?php echo esc_attr( $details->domain ) ?>" size="33" /></td>
-                       <?php } ?>
-               </tr>
-               <tr class="form-field form-required">
-                       <th scope="row"><?php _e( 'Path' ) ?></th>
-                       <?php if ( $is_main_site ) { ?>
-                       <td><code><?php echo esc_attr( $details->path ) ?></code></td>
-                       <?php
-                       } else {
+                       <code><?php echo $protocol; echo esc_html( $site_url_no_http );  ?></code>
+                       <?php } else {
                                switch_to_blog( $id );
                        ?>
-                       <td><input name="blog[path]" type="text" id="path" value="<?php echo esc_attr( $details->path ) ?>" size="40" style='margin-bottom:5px;' />
-                       <br /><input type="checkbox" style="width:20px;" name="update_home_url" value="update" <?php if ( get_option( 'siteurl' ) == untrailingslashit( get_blogaddress_by_id ($id ) ) || get_option( 'home' ) == untrailingslashit( get_blogaddress_by_id( $id ) ) ) echo 'checked="checked"'; ?> /> <?php _e( 'Update <code>siteurl</code> and <code>home</code> as well.' ); ?></td>
+
+                       <?php echo $protocol; ?><input name="blog[url]" type="text" id="url" value="<?php echo esc_attr( $site_url_no_http ) ?>" />
+
+                       <br /><input type="checkbox" style="width:20px;" name="update_home_url" value="update" <?php checked( get_option( 'siteurl' ) == untrailingslashit( get_blogaddress_by_id ($id ) ) || get_option( 'home' ) == untrailingslashit( get_blogaddress_by_id( $id ) ) ) ?> /> <?php _e( 'Update <code>siteurl</code> and <code>home</code> as well.' ); ?></td>
                        <?php
                                restore_current_blog();
                        } ?>
+                       </td>
                </tr>
                <tr class="form-field">
                        <th scope="row"><?php _ex( 'Registered', 'site' ) ?></th>