Ticket #27866: 27866.3.diff
File 27866.3.diff, 1.3 KB (added by , 11 years ago) |
---|
-
wp-includes/ms-settings.php
35 35 $_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -4 ); 36 36 } 37 37 38 $path = str tolower( stripslashes( $_SERVER['REQUEST_URI'] ));38 $path = stripslashes( $_SERVER['REQUEST_URI'] ); 39 39 if ( is_admin() ) { 40 40 $path = preg_replace( '#(.*)/wp-admin/.*#', '$1/', $path ); 41 41 } … … 53 53 $current_site->blog_id = BLOGID_CURRENT_SITE; 54 54 } 55 55 56 if ( $current_site->domain === $domain && $current_site->path === $path) {56 if ( $current_site->domain === $domain && 0 === strcasecmp( $current_site->path, $path ) ) { 57 57 $current_blog = get_site_by_path( $domain, $path ); 58 } elseif ( '/' !== $current_site->path && $current_site->domain === $domain && 0 === str pos( $path, $current_site->path ) ) {58 } elseif ( '/' !== $current_site->path && $current_site->domain === $domain && 0 === stripos( $path, $current_site->path ) ) { 59 59 // If the current network has a path and also matches the domain and path of the request, 60 60 // we need to look for a site using the first path segment following the network's path. 61 61 $current_blog = get_site_by_path( $domain, $path, 1 + count( explode( '/', trim( $current_site->path, '/' ) ) ) );