summaryrefslogtreecommitdiff
path: root/includes/install.core.inc
diff options
context:
space:
mode:
Diffstat (limited to 'includes/install.core.inc')
-rw-r--r--includes/install.core.inc12
1 files changed, 6 insertions, 6 deletions
diff --git a/includes/install.core.inc b/includes/install.core.inc
index a334f7bb3..906a48e43 100644
--- a/includes/install.core.inc
+++ b/includes/install.core.inc
@@ -275,12 +275,12 @@ function install_begin_request(&$install_state) {
require_once DRUPAL_ROOT . '/includes/cache-install.inc';
$conf['cache_default_class'] = 'DrupalFakeCache';
- // Prepare for themed output, if necessary. We need to run this at the
- // beginning of the page request to avoid a different theme accidentally
- // getting set.
- if ($install_state['interactive']) {
- drupal_maintenance_theme();
- }
+ // Prepare for themed output. We need to run this at the beginning of the
+ // page request to avoid a different theme accidentally getting set. (We also
+ // need to run it even in the case of command-line installations, to prevent
+ // any code in the installer that happens to initialize the theme system from
+ // accessing the database before it is set up yet.)
+ drupal_maintenance_theme();
// Check existing settings.php.
$install_state['settings_verified'] = install_verify_settings();