Changeset 28280 for trunk/src/wp-includes/ms-load.php

Timestamp:

05/06/2014 05:31:12 AM (11 years ago)

Author:

nacin

Message:

Multisite: Treat 'www' as a special subdomain, reversing 3.9 regression.

props jeremyfelt.
fixes #27927.

File:

• trunk/src/wp-includes/ms-load.php (modified) (1 diff)

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

@@ -349 +349 @@
      */
 
+    // Either www or non-www is supported, not both. If a www domain is requested,
+    // query for both to provide the proper redirect.
+    $domains = array( $domain );
+    if ( 'www.' === substr( $domain, 0, 4 ) ) {
+        $domains[] = substr( $domain, 4 );
+        $search_domains = "'" . implode( "', '", $wpdb->_escape( $domains ) ) . "'";
+    }
+
     if ( count( $paths ) > 1 ) {
-        $paths = "'" . implode( "', '", $wpdb->_escape( $paths ) ) . "'";
-        $sql = $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s", $domain );
-        $sql .= " AND path IN ($paths) ORDER BY CHAR_LENGTH(path) DESC LIMIT 1";
+        $search_paths = "'" . implode( "', '", $wpdb->_escape( $paths ) ) . "'";
+    }
+
+    if ( count( $domains ) > 1 && count( $paths ) > 1 ) {
+        $site = $wpdb->get_row( "SELECT * FROM $wpdb->blogs WHERE domain IN ($search_domains) AND path IN ($search_paths) ORDER BY CHAR_LENGTH(domain) DESC, CHAR_LENGTH(path) DESC LIMIT 1" );
+    } elseif ( count( $domains ) > 1 ) {
+        $sql = $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE path = %s", $paths[0] );
+        $sql .= " AND domain IN ($search_domains) ORDER BY CHAR_LENGTH(domain) DESC LIMIT 1";
+        $site = $wpdb->get_row( $sql );
+    } elseif ( count( $paths ) > 1 ) {
+        $sql = $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s", $domains[0] );
+        $sql .= " AND path IN ($search_paths) ORDER BY CHAR_LENGTH(path) DESC LIMIT 1";
         $site = $wpdb->get_row( $sql );
     } else {
-        $site = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s and path = %s", $domain, $paths[0] ) );
+        $site = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $domains[0], $paths[0] ) );
     }