diff options
| -rw-r--r-- | includes/bootstrap.inc | 2 | ||||
| -rw-r--r-- | install.php | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index dc9cbfc0b..02b300114 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -257,7 +257,7 @@ function conf_path($require_settings = TRUE, $reset = FALSE) { */ 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 --git a/install.php b/install.php index 2f07f0140..2a254abcc 100644 --- a/install.php +++ b/install.php @@ -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'; |