Ticket #32503: 32503.diff

src/wp-admin/network/site-info.php

@@ -65 +65 @@
         }
         update_blog_details( $id, $blog_data );
 
-        if ( isset( $_POST['update_home_url'] ) && $_POST['update_home_url'] == 'update' ) {
-                $new_details = get_blog_details( $id, false );
-                $blog_address = esc_url_raw( $new_details->domain . $new_details->path );
+        $new_details = get_blog_details( $id, false );
+        $blog_address = esc_url_raw( $new_details->domain . $new_details->path );
+        if ( get_option( 'home' ) != $blog_address ) {
+                update_option( 'home', $blog_address );
+        }
+
+        if ( isset( $_POST['update_site_url'] ) && $_POST['update_site_url'] == 'update' ) {
                 if ( get_option( 'siteurl' ) != $blog_address ) {
                         update_option( 'siteurl', $blog_address );
                 }
-                if ( get_option( 'home' ) != $blog_address ) {
-                        update_option( 'home', $blog_address );
-                }
         }
 
         restore_current_blog();
@@ -143 +144 @@
                         <th scope="row"><label for="path"><?php _e( 'Path' ) ?></label></th>
                         <td>
                                 <input name="blog[path]" type="text" id="path" value="<?php echo esc_attr( $details->path ) ?>" /><br />
-                                <input type="checkbox" name="update_home_url" id="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"'; ?> /> <label for="update_home_url"><?php _e( 'Update <code>siteurl</code> and <code>home</code> as well.' ); ?></label>
+                                <input type="checkbox" name="update_site_url" id="update_site_url" value="update" <?php if ( get_option( 'siteurl' ) == untrailingslashit( get_blogaddress_by_id ($id ) ) ) echo 'checked="checked"'; ?> /> <label for="update_site_url"><?php _e( 'Update <code>siteurl</code> as well.' ); ?></label>
                         </td>
                         <?php
                                 restore_current_blog();