diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-07-08 03:41:27 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-07-08 03:41:27 +0000 |
| commit | 8f5c296cc08ee58206d204f61fe13abbbe050baf (patch) | |
| tree | df85fe532263b63fa5a911221a138a62440cfd5a /includes | |
| parent | 893fba439bd0fa2d17075715a383a374ff2a4cc6 (diff) | |
| download | brdo-8f5c296cc08ee58206d204f61fe13abbbe050baf.tar.gz brdo-8f5c296cc08ee58206d204f61fe13abbbe050baf.tar.bz2 | |
#845742 by Damien Tournoud: Make Bartik the default core theme.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/theme.inc | 4 | ||||
| -rw-r--r-- | includes/theme.maintenance.inc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/includes/theme.inc b/includes/theme.inc index 67406a8d9..fef9221c1 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -81,7 +81,7 @@ function drupal_theme_initialize() { // Only select the user selected theme if it is available in the // list of themes that can be accessed. - $theme = !empty($user->theme) && drupal_theme_access($user->theme) ? $user->theme : variable_get('theme_default', 'garland'); + $theme = !empty($user->theme) && drupal_theme_access($user->theme) ? $user->theme : variable_get('theme_default', 'bartik'); // Allow modules to override the theme. Validation has already been performed // inside menu_get_custom_theme(), so we do not need to check it again here. @@ -1260,7 +1260,7 @@ function theme_enable($theme_list) { */ function theme_disable($theme_list) { // Don't disable the default theme. - if ($pos = array_search(variable_get('theme_default', 'garland'), $theme_list) !== FALSE) { + if ($pos = array_search(variable_get('theme_default', 'bartik'), $theme_list) !== FALSE) { unset($theme_list[$pos]); if (empty($theme_list)) { return; diff --git a/includes/theme.maintenance.inc b/includes/theme.maintenance.inc index 5d1a9b9c7..6049141f0 100644 --- a/includes/theme.maintenance.inc +++ b/includes/theme.maintenance.inc @@ -46,7 +46,7 @@ function _drupal_maintenance_theme() { // We use the default theme as the maintenance theme. If a default theme // isn't specified in the database or in settings.php, we use Garland. - $custom_theme = variable_get('maintenance_theme', variable_get('theme_default', 'garland')); + $custom_theme = variable_get('maintenance_theme', variable_get('theme_default', 'bartik')); } // Ensure that system.module is loaded. |