summaryrefslogtreecommitdiffstats
path: root/wpmu-settings.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-06-27 12:26:34 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-06-27 12:26:34 +0000
commitd7a0e0bed98dccdcd11a1b21cdff9423c3cc59c7 (patch)
tree2099f646992bd51da7e3e3a7f5cd03079e87c1a3 /wpmu-settings.php
parent8db1e81228b0e295199f6e3ee8a99d223c48f8c2 (diff)
downloadwordpress-mu-d7a0e0bed98dccdcd11a1b21cdff9423c3cc59c7.tar.gz
wordpress-mu-d7a0e0bed98dccdcd11a1b21cdff9423c3cc59c7.tar.xz
wordpress-mu-d7a0e0bed98dccdcd11a1b21cdff9423c3cc59c7.zip
Check if final part of $path is a filename.
This fixes problems with logging in using subdirs git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@600 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wpmu-settings.php')
-rw-r--r--wpmu-settings.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/wpmu-settings.php b/wpmu-settings.php
index fb8e7cb..e80999b 100644
--- a/wpmu-settings.php
+++ b/wpmu-settings.php
@@ -59,7 +59,7 @@ if( constant( 'VHOST' ) == 'yes' ) {
$blogname = htmlspecialchars( substr( $_SERVER[ 'REQUEST_URI' ], strlen( $path ) ) );
if( strpos( $blogname, '/' ) )
$blogname = substr( $blogname, 0, strpos( $blogname, '/' ) );
- if( $blogname == '' || $blogname == 'blog' || $blogname == 'wp-admin' || $blogname == 'files' || $blogname == 'feed' ) {
+ if( $blogname == '' || $blogname == 'blog' || $blogname == 'wp-admin' || $blogname == 'files' || $blogname == 'feed' || is_file( $blogname ) ) {
$current_blog = $wpdb->get_row("SELECT * FROM $wpdb->blogs WHERE domain = '$domain' AND path = '$path'");
} else {
$current_blog = $wpdb->get_row("SELECT * FROM $wpdb->blogs WHERE domain = '$domain' AND path = '{$path}{$blogname}/'");