From 470b2e374e59abb186b2c806b1542ca0ebf0ad8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Hojtsy?= <gabor@hojtsy.hu>
Date: Sun, 9 Sep 2007 19:46:54 +0000
Subject: #172262 by JirkaRybka: better globals handling in install system, so
 the choosen profile and language are remembered

---
 install.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'install.php')

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';
 
-- 
cgit v1.2.3