From 7839dd671c2e8bbfa9ae33bb1d13472e5c059dc0 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Tue, 6 May 2014 05:23:56 +0000 Subject: [PATCH] Multisite: Fix case sensitivity regressions in 3.9. props jeremyfelt. fixes #27866. git-svn-id: https://develop.svn.wordpress.org/trunk@28276 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/ms-settings.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/wp-includes/ms-settings.php b/src/wp-includes/ms-settings.php index ddcbb997f2..d4383d3b91 100644 --- a/src/wp-includes/ms-settings.php +++ b/src/wp-includes/ms-settings.php @@ -35,7 +35,7 @@ if ( !isset( $current_site ) || !isset( $current_blog ) ) { $_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -4 ); } - $path = strtolower( stripslashes( $_SERVER['REQUEST_URI'] ) ); + $path = stripslashes( $_SERVER['REQUEST_URI'] ); if ( is_admin() ) { $path = preg_replace( '#(.*)/wp-admin/.*#', '$1/', $path ); } @@ -53,9 +53,9 @@ if ( !isset( $current_site ) || !isset( $current_blog ) ) { $current_site->blog_id = BLOGID_CURRENT_SITE; } - 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. $current_blog = get_site_by_path( $domain, $path, 1 + count( explode( '/', trim( $current_site->path, '/' ) ) ) );