summaryrefslogtreecommitdiffstats
path: root/wp-settings.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-01-11 15:57:00 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-01-11 15:57:00 +0000
commite4426def6d30d301a3f2eb8f7270345d9781edfe (patch)
treee881e449092e7f1617cad3d89e0a7a3878641fb3 /wp-settings.php
parenta35bb9df8c7816a6facf68ff963d5350999befe4 (diff)
downloadwordpress-mu-e4426def6d30d301a3f2eb8f7270345d9781edfe.tar.gz
wordpress-mu-e4426def6d30d301a3f2eb8f7270345d9781edfe.tar.xz
wordpress-mu-e4426def6d30d301a3f2eb8f7270345d9781edfe.zip
WP Merge to rev 4721
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@840 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-settings.php')
-rw-r--r--wp-settings.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/wp-settings.php b/wp-settings.php
index 482a5fa..f39ec9a 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -15,8 +15,10 @@ function wp_unregister_GLOBALS() {
$input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array());
foreach ( $input as $k => $v )
- if ( !in_array($k, $noUnset) && isset($GLOBALS[$k]) )
+ if ( !in_array($k, $noUnset) && isset($GLOBALS[$k]) ) {
+ $GLOBALS[$k] = NULL;
unset($GLOBALS[$k]);
+ }
}
wp_unregister_GLOBALS();