Permalink
Browse files

Accidental commit. Props Nazgul. fixes #4437

git-svn-id: http://svn.automattic.com/wordpress/trunk@5690 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
1 parent 845ae56 commit d4f95b7fd406451365fc42b5d235d6a1fd7f3abb rob1n committed Jun 12, 2007
Showing with 17 additions and 15 deletions.
  1. +17 −15 wp-settings.php
View
@@ -1,26 +1,28 @@
<?php
+// Turn register globals off
+function wp_unregister_GLOBALS() {
+ if ( !ini_get('register_globals') )
+ return;
-if ( ini_get( 'register_globals' ) ) {
- if ( isset( $_REQUEST['GLOBALS'] ) ) {
- die( 'GLOBALS overwrite attempt detected. Exiting.' );
- }
-
- $no_unset = array( 'GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES', 'table_prefix' );
- $input = array_merge( $_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, is_array( $_SESSION ) ? $_SESSION : array() );
-
- foreach ( $input as $key => $val ) {
- if ( !in_array( $key, $no_unset ) && isset( $GLOBALS[$k] ) ) {
+ if ( isset($_REQUEST['GLOBALS']) )
+ die('GLOBALS overwrite attempt detected');
+
+ // Variables that shouldn't be unset
+ $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES', 'table_prefix');
+
+ $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]) ) {
$GLOBALS[$k] = NULL;
- unset( $GLOBALS[$key] );
+ unset($GLOBALS[$k]);
}
- }
-
- unset( $no_unset, $input );
}
+wp_unregister_GLOBALS();
+
unset( $wp_filter, $cache_userdata, $cache_lastcommentmodified, $cache_lastpostdate, $cache_settings, $category_cache, $cache_categories );
-if ( !isset( $blog_id ) )
+if ( ! isset($blog_id) )
$blog_id = 1;
// Fix for IIS, which doesn't set REQUEST_URI

0 comments on commit d4f95b7

Please sign in to comment.