Changeset 58097 for trunk/src/wp-admin/network/site-info.php

Timestamp:

05/04/2024 07:23:31 PM (7 months ago)

Author:

johnbillion

Message:

Bootstrap/Load: Add support for custom ports in multisite site addresses.

This allows a Multisite network to use an address that includes a port name, such as example.com:1234, and adds support for this to the local development environment too. You can now run a Multisite installation on the local development environment, for example at localhost:8889.

This also fixes some bugs with running a single site installation on a port, and updates the testing infrastructure so that the whole test suite runs both with and without a port number.

Props djzone, scribu, nacin, ipstenu, F J Kaiser, jeremyfelt, johnjamesjacoby, spacedmonkey, PerS, Clorith, Blackbam, enrico.sorcinelli, Jules Colle, obliviousharmony, desrosj, johnbillion

Fixes #21077, #52088

File:

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

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

@@ -67 +67 @@
 
         $blog_data['scheme'] = $update_parsed_url['scheme'];
+
+        // Make sure to not lose the port if it was provided.
         $blog_data['domain'] = $update_parsed_url['host'];
-        $blog_data['path']   = $update_parsed_url['path'];
+        if ( isset( $update_parsed_url['port'] ) ) {
+            $blog_data['domain'] .= ':' . $update_parsed_url['port'];
+        }
+
+        $blog_data['path'] = $update_parsed_url['path'];
     }
 
@@ -89 +95 @@
     $old_home_url    = trailingslashit( esc_url( get_option( 'home' ) ) );
     $old_home_parsed = parse_url( $old_home_url );
-
-    if ( $old_home_parsed['host'] === $existing_details->domain && $old_home_parsed['path'] === $existing_details->path ) {
+    $old_home_host   = $old_home_parsed['host'] . ( isset( $old_home_parsed['port'] ) ? ':' . $old_home_parsed['port'] : '' );
+
+    if ( $old_home_host === $existing_details->domain && $old_home_parsed['path'] === $existing_details->path ) {
         $new_home_url = untrailingslashit( sanitize_url( $blog_data['scheme'] . '://' . $new_details->domain . $new_details->path ) );
         update_option( 'home', $new_home_url );
@@ -97 +104 @@
     $old_site_url    = trailingslashit( esc_url( get_option( 'siteurl' ) ) );
     $old_site_parsed = parse_url( $old_site_url );
-
-    if ( $old_site_parsed['host'] === $existing_details->domain && $old_site_parsed['path'] === $existing_details->path ) {
+    $old_site_host   = $old_site_parsed['host'] . ( isset( $old_site_parsed['port'] ) ? ':' . $old_site_parsed['port'] : '' );
+
+    if ( $old_site_host === $existing_details->domain && $old_site_parsed['path'] === $existing_details->path ) {
         $new_site_url = untrailingslashit( sanitize_url( $blog_data['scheme'] . '://' . $new_details->domain . $new_details->path ) );
         update_option( 'siteurl', $new_site_url );