summaryrefslogtreecommitdiffstats
path: root/wp-settings.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-07-09 19:51:04 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-07-09 19:51:04 +0000
commit6e9f64cd5d0a998c05e950f68093b12ddfb77e7e (patch)
treeb56f7e9262db62661370b1d76395e4251fff012a /wp-settings.php
parentdd27229feb3a8ebe96f612c033b9575e05901c7d (diff)
downloadwordpress-mu-6e9f64cd5d0a998c05e950f68093b12ddfb77e7e.tar.gz
wordpress-mu-6e9f64cd5d0a998c05e950f68093b12ddfb77e7e.tar.xz
wordpress-mu-6e9f64cd5d0a998c05e950f68093b12ddfb77e7e.zip
Correct PHP_SELF when VHOST == no, fixes #626, props jergendutch
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1363 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-settings.php')
-rw-r--r--wp-settings.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/wp-settings.php b/wp-settings.php
index 834f26e..599b16f 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -93,7 +93,7 @@ if (strpos($_SERVER['SCRIPT_NAME'], 'php.cgi') !== false)
// Fix empty PHP_SELF
$PHP_SELF = $_SERVER['PHP_SELF'];
-if ( empty($PHP_SELF) )
+if ( empty($PHP_SELF) || constant( 'VHOST' ) == 'no' )
$_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace("/(\?.*)?$/",'',$_SERVER["REQUEST_URI"]);
if ( version_compare( '4.3', phpversion(), '>' ) ) {