diff -urp --strip-trailing-cr drupal-6x-orig/includes/bootstrap.inc drupal-6.x-dev/includes/bootstrap.inc --- drupal-6x-orig/includes/bootstrap.inc 2007-09-07 12:33:06.000000000 +0200 +++ drupal-6.x-dev/includes/bootstrap.inc 2007-09-08 14:09:09.000000000 +0200 @@ -257,7 +257,7 @@ function conf_path($require_settings = T */ function drupal_unset_globals() { if (ini_get('register_globals')) { - $allowed = array('_ENV' => 1, '_GET' => 1, '_POST' => 1, '_COOKIE' => 1, '_FILES' => 1, '_SERVER' => 1, '_REQUEST' => 1, 'access_check' => 1, 'GLOBALS' => 1); + $allowed = array('_ENV' => 1, '_GET' => 1, '_POST' => 1, '_COOKIE' => 1, '_FILES' => 1, '_SERVER' => 1, '_REQUEST' => 1, 'GLOBALS' => 1); foreach ($GLOBALS as $key => $value) { if (!isset($allowed[$key])) { unset($GLOBALS[$key]); diff -urp --strip-trailing-cr drupal-6x-orig/install.php drupal-6.x-dev/install.php --- drupal-6x-orig/install.php 2007-09-04 23:10:45.000000000 +0200 +++ drupal-6.x-dev/install.php 2007-09-08 14:08:00.000000000 +0200 @@ -15,10 +15,12 @@ require_once './includes/install.inc'; * The installation phase we should proceed to. */ function install_main() { - global $profile, $install_locale, $conf; require_once './includes/bootstrap.inc'; drupal_bootstrap(DRUPAL_BOOTSTRAP_CONFIGURATION); + // This must go after drupal_bootstrap(), which unsets globals! + global $profile, $install_locale, $conf; + require_once './modules/system/system.install'; require_once './includes/file.inc';