diff options
| author | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-09-09 19:46:54 +0000 |
|---|---|---|
| committer | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-09-09 19:46:54 +0000 |
| commit | 470b2e374e59abb186b2c806b1542ca0ebf0ad8c (patch) | |
| tree | de2c16f829c0b3dce0627c00251b12a3fa01c8f5 /install.php | |
| parent | 4a347be7ed2b6afa6e18ad87a0f78e4558e1e0b7 (diff) | |
| download | brdo-470b2e374e59abb186b2c806b1542ca0ebf0ad8c.tar.gz brdo-470b2e374e59abb186b2c806b1542ca0ebf0ad8c.tar.bz2 | |
#172262 by JirkaRybka: better globals handling in install system, so the choosen profile and language are remembered
Diffstat (limited to 'install.php')
| -rw-r--r-- | install.php | 4 |
1 files changed, 3 insertions, 1 deletions
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'; |