#141727 follow up by dvessel: fix maintenance theme in updates

1 files changed, 9 insertions, 9 deletions

diff --git a/includes/theme.maintenance.inc b/includes/theme.maintenance.inc
index cfc34e09b..142ae91ee 100644
--- a/includes/theme.maintenance.inc
+++ b/includes/theme.maintenance.inc
@@ -31,23 +31,23 @@ function _drupal_maintenance_theme() {
   require_once './includes/database.inc';
   unicode_check();
 
-  // Load module basics (needed for hook invokes).
-  $module_list['system']['filename'] = 'modules/system/system.module';
-  $module_list['filter']['filename'] = 'modules/filter/filter.module';
-  module_list(TRUE, FALSE, FALSE, $module_list);
-  drupal_load('module', 'system');
-  drupal_load('module', 'filter');
-
-  $themes = list_themes();
-
   // Install and update pages are treated differently to prevent theming overrides.
   if (defined('MAINTENANCE_MODE') && (MAINTENANCE_MODE == 'install' || MAINTENANCE_MODE == 'update')) {
     $theme = 'minnelli';
   }
   else {
+    // Load module basics (needed for hook invokes).
+    $module_list['system']['filename'] = 'modules/system/system.module';
+    $module_list['filter']['filename'] = 'modules/filter/filter.module';
+    module_list(TRUE, FALSE, FALSE, $module_list);
+    drupal_load('module', 'system');
+    drupal_load('module', 'filter');
+
     $theme = variable_get('maintenance_theme', 'minnelli');
   }
 
+  $themes = list_themes();
+
   // Store the identifier for retrieving theme settings with.
   $theme_key = $theme;