Changeset 27178 for trunk/src/wp-includes/ms-settings.php

Timestamp:

02/13/2014 11:06:12 PM (11 years ago)

Author:

nacin

Message:

Multisite: Add get_network_by_path() and wp_get_network() to begin cleanup of multisite load.

Tries to get network detection under control by simplifying wpmu_current_site(). It now also pops off each subdomain to find a more general match. Adds unit tests for get_network_by_path() and a new network factory for unit tests.

Much of this is likely to change in 3.9 as more of ms-load.php and ms-settings.php gets hacked to bits.

props jeremyfelt.
see #27003.

File:

• trunk/src/wp-includes/ms-settings.php (modified) (2 diffs)

trunk/src/wp-includes/ms-settings.php

@@ -38 +38 @@
 
     $domain = rtrim( $domain, '.' );
-    $cookie_domain = $domain;
-    if ( substr( $cookie_domain, 0, 4 ) == 'www.' )
-        $cookie_domain = substr( $cookie_domain, 4 );
 
     $path = preg_replace( '|([a-z0-9-]+.php.*)|', '', $_SERVER['REQUEST_URI'] );
@@ -47 +44 @@
 
     $current_site = wpmu_current_site();
+    $current_site->cookie_domain = $current_site->domain;
+    if ( 'www.' === substr( $current_site->cookie_domain, 0, 4 ) ) {
+        $current_site->cookie_domain = substr( $current_site->cookie_domain, 4 );
+    }
+
     if ( ! isset( $current_site->blog_id ) )
         $current_site->blog_id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s", $current_site->domain, $current_site->path ) );