Changeset 28278

Timestamp:

05/06/2014 05:25:02 AM (11 years ago)

Author:

nacin

Message:

Multisite: Fix case sensitivity regressions in 3.9.

Merges [28276] to the 3.9 branch.

props jeremyfelt.
fixes #27866.

Location:

branches/3.9

Files:

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

branches/3.9/src/wp-includes/ms-settings.php

@@ -36 +36 @@
     }
 
-    $path = strtolower( stripslashes( $_SERVER['REQUEST_URI'] ) );
+    $path = stripslashes( $_SERVER['REQUEST_URI'] );
     if ( is_admin() ) {
         $path = preg_replace( '#(.*)/wp-admin/.*#', '$1/', $path );
@@ -54 +54 @@
         }
 
-        if ( $current_site->domain === $domain && $current_site->path === $path ) {
+        if ( 0 === strcasecmp( $current_site->domain, $domain ) && 0 === strcasecmp( $current_site->path, $path ) ) {
             $current_blog = get_site_by_path( $domain, $path );
-        } elseif ( '/' !== $current_site->path && $current_site->domain === $domain && 0 === strpos( $path, $current_site->path ) ) {
+        } elseif ( '/' !== $current_site->path && 0 === strcasecmp( $current_site->domain, $domain ) && 0 === stripos( $path, $current_site->path ) ) {
             // If the current network has a path and also matches the domain and path of the request,
             // we need to look for a site using the first path segment following the network's path.