From 3874a36223c2f72cb934d253e5c5830b6c4ae2ae Mon Sep 17 00:00:00 2001 From: Ron Rennick Date: Tue, 26 Jan 2010 15:20:49 +0000 Subject: [PATCH] Change VHOST check to is_subdomain_install(), See #11796 git-svn-id: https://develop.svn.wordpress.org/trunk@12836 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/ms-load.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-includes/ms-load.php b/wp-includes/ms-load.php index 98fd77839b..ec6c205779 100644 --- a/wp-includes/ms-load.php +++ b/wp-includes/ms-load.php @@ -21,7 +21,7 @@ $table_prefix = $wpdb->get_blog_prefix(); // Fix empty PHP_SELF $PHP_SELF = $_SERVER['PHP_SELF']; -if ( empty($PHP_SELF) || ( empty($PHP_SELF) && constant( 'VHOST' ) == 'no' && $current_blog->path != '/' ) ) +if ( empty($PHP_SELF) || ( empty($PHP_SELF) && !is_subdomain_install() && $current_blog->path != '/' ) ) $_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace("/(\?.*)?$/",'',$_SERVER["REQUEST_URI"]); wp_cache_init(); // need to init cache again after blog_id is set