diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-10-27 19:29:12 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-10-27 19:29:12 +0000 |
| commit | 1da73d26c2d8018f389f6290e2be8249280e76bc (patch) | |
| tree | dba8b489c55f45796d505229d0c389ad33a08757 /includes/theme.maintenance.inc | |
| parent | 37eb92447f21d8acd984df0f3365e174283869ed (diff) | |
| download | brdo-1da73d26c2d8018f389f6290e2be8249280e76bc.tar.gz brdo-1da73d26c2d8018f389f6290e2be8249280e76bc.tar.bz2 | |
#591794 by chx, Rob Loach, sun, JohnAlbin: Give themes access to alter hooks.
Diffstat (limited to 'includes/theme.maintenance.inc')
| -rw-r--r-- | includes/theme.maintenance.inc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/includes/theme.maintenance.inc b/includes/theme.maintenance.inc index a625e15c0..5ba1ee3ac 100644 --- a/includes/theme.maintenance.inc +++ b/includes/theme.maintenance.inc @@ -33,7 +33,7 @@ function _drupal_maintenance_theme() { // Install and update pages are treated differently to prevent theming overrides. if (defined('MAINTENANCE_MODE') && (MAINTENANCE_MODE == 'install' || MAINTENANCE_MODE == 'update')) { - $theme = 'minnelli'; + $custom_theme = 'minnelli'; } else { if (!db_is_active()) { @@ -46,11 +46,16 @@ function _drupal_maintenance_theme() { drupal_load('module', 'filter'); } - $theme = variable_get('maintenance_theme', 'minnelli'); + $custom_theme = variable_get('maintenance_theme', 'minnelli'); } $themes = list_themes(); + // list_themes() triggers a drupal_alter() in maintenance mode, but we can't + // let themes alter the .info data until we know a theme's base themes. So + // don't set global $theme until after list_themes() builds its cache. + $theme = $custom_theme; + // Store the identifier for retrieving theme settings with. $theme_key = $theme; |