summaryrefslogtreecommitdiff
path: root/install.php
diff options
context:
space:
mode:
Diffstat (limited to 'install.php')
-rw-r--r--install.php4
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';