Changeset 3382

Timestamp:

12/29/2005 11:11:26 PM (20 years ago)

Author:

ryan

Message:

Move PHP_SELF setup to wp-settings.php. #2153

Location:

trunk

Files:

• wp-includes/vars.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

trunk/wp-includes/vars.php

@@ -2 +2 @@
 
 // On which page are we ?
-$PHP_SELF = $_SERVER['PHP_SELF'];
-if ( empty($PHP_SELF) )
-    $_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace("/(\?.*)?$/",'',$_SERVER["REQUEST_URI"]);
-
 if (preg_match('#([^/]+.php)#', $PHP_SELF, $self_matches)) {
     $pagenow = $self_matches[1];

trunk/wp-settings.php

@@ -43 +43 @@
     unset($_SERVER['PATH_INFO']);
 
+// Fix empty PHP_SELF
+$PHP_SELF = $_SERVER['PHP_SELF'];
+if ( empty($PHP_SELF) )
+    $_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace("/(\?.*)?$/",'',$_SERVER["REQUEST_URI"]);
 
 if ( !(phpversion() >= '4.1') )