Changeset 2770 for trunk/wp-settings.php

Timestamp:

08/09/2005 08:09:20 PM (19 years ago)

Author:

matt

Message:

That last thing didn't work at all.

File:

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

trunk/wp-settings.php

@@ -4 +4 @@
 $HTTP_USER_AGENT = getenv('HTTP_USER_AGENT'); /* visitor's browser */
 
-// Turn register globals off - Christian Schmidt
-if ( ini_get('register_globals') )
-    foreach ( array_merge($_REQUEST, $_SERVER, $_ENV) as $name => $value )
-        unset($name, $value);
+// Turn register globals off
+if ( ini_get('register_globals') ) {
+   $superglobals = array($_SERVER, $_ENV, $_FILES, $_COOKIE, $_POST, $_GET);
+   if ( isset($_SESSION) )
+        array_unshift($superglobals, $_SESSION);
+
+   foreach ( $superglobals as $superglobal )
+       foreach ( $superglobal as $global => $value )
+           unset( $GLOBALS[$global] );
+}
 
 // Fix for IIS, which doesn't set REQUEST_URI