From 3d4c635b643867abc3a0f95551bb39eb0aa45dd7 Mon Sep 17 00:00:00 2001
From: Matt Mullenweg <matt@git.wordpress.org>
Date: Tue, 9 Aug 2005 20:00:29 +0000
Subject: [PATCH] Fixes #1565

git-svn-id: https://develop.svn.wordpress.org/trunk@2769 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-settings.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/wp-settings.php b/wp-settings.php
index f7bcb0fc29..9fd32c2eb7 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -4,8 +4,9 @@ $REMOTE_ADDR = getenv('REMOTE_ADDR'); /* visitor's IP */
 $HTTP_USER_AGENT = getenv('HTTP_USER_AGENT'); /* visitor's browser */
 
 // Turn register globals off - Christian Schmidt
-foreach ( array_merge($_REQUEST, $_SERVER, $_ENV) as $name => $value )
-	unset($$name);
+if ( ini_get('register_globals') )
+	foreach ( array_merge($_REQUEST, $_SERVER, $_ENV) as $name => $value )
+		unset($name, $value);
 
 // Fix for IIS, which doesn't set REQUEST_URI
 if ( empty( $_SERVER['REQUEST_URI'] ) ) {