Changeset 33586

Timestamp:

08/05/2015 03:33:53 AM (11 years ago)

Author:

jeremyfelt

Message:

Multisite: Use single URL input when editing sites in a subdirectory configuration

In [32759], we adjusted site-info.php to display a single input for a site's full URL if the network was configured for subdomains. We also enforced path only editing for non-subdomain networks, which is a regression in expected behavior.

The full URL of a site can now be edited in both subdomain and subdirectory configurations.

Props @michaelryanmcneill.
Fixes #22383.

File:

• trunk/src/wp-admin/network/site-info.php (modified) (3 diffs)

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

@@ -69 +69 @@
                 $blog_data['domain'] = $details->domain;
                 $blog_data['path'] = $details->path;
-        } elseif ( is_subdomain_install() ) {
-                // All parts of a URL can be updated for a subdomain configuration. We first
+        } else {
+                // For any other site, the scheme, domain, and path can all be changed. We first
                 // need to ensure a scheme has been provided, otherwise fallback to the existing.
                 $new_url_scheme = parse_url( $blog_data['url'], PHP_URL_SCHEME );
@@ -82 +82 @@
                 $blog_data['domain'] = $update_parsed_url['host'];
                 $blog_data['path'] = $update_parsed_url['path'];
-        } else {
-                // Only the path can be updated for a subdirectory configuration, so capture existing domain.
-                $blog_data['domain'] = $details->domain;
         }
 
@@ -175 +172 @@
                 </tr>
                 <?php
-                // In a subdomain configuration, the scheme, domain, and path can all be changed.
-                elseif ( is_subdomain_install() ) : ?>
+                // 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>
                         <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
-                // In a subdirectory configuration, only the path can be changed.
-                // Scheme and domain are inherited from the network.
-                else : ?>
-                <tr class="form-field">
-                        <th scope="row"><?php _e( 'Domain' ); ?></th>
-                        <td><?php echo $parsed_scheme . ':// ' . esc_attr( $details->domain ); ?></td>
-                </tr>
-                <tr class="form-field form-required">
-                        <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 />
-                        </td>
                 </tr>
                 <?php endif; ?>