diff options
| -rw-r--r-- | includes/theme.inc | 2 | ||||
| -rw-r--r-- | modules/block/block.module | 4 | ||||
| -rw-r--r-- | modules/system/system.install | 6 | ||||
| -rw-r--r-- | modules/system/system.module | 10 | ||||
| -rw-r--r-- | sites/default/settings.php | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/includes/theme.inc b/includes/theme.inc index f8a3313b5..e90fb36f1 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -42,7 +42,7 @@ function init_theme() { // Only select the user selected theme if it is available in the // list of enabled themes. - $theme = $user->theme && $themes[$user->theme]->status ? $user->theme : variable_get('theme_default', 'bluemarine'); + $theme = $user->theme && $themes[$user->theme]->status ? $user->theme : variable_get('theme_default', 'garland'); // Allow modules to override the present theme... only select custom theme // if it is available in the list of installed themes. diff --git a/modules/block/block.module b/modules/block/block.module index c7e9b1adf..9401498a6 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -88,7 +88,7 @@ function block_menu($may_cache) { 'callback' => 'drupal_get_form', 'callback arguments' => array('block_box_form'), 'type' => MENU_LOCAL_TASK); - $default = variable_get('theme_default', 'bluemarine'); + $default = variable_get('theme_default', 'garland'); foreach (list_themes() as $key => $theme) { if ($theme->status) { $items[] = array( @@ -220,7 +220,7 @@ function block_admin_display($theme = NULL) { $custom_theme = $theme; } else { - $custom_theme = variable_get('theme_default', 'bluemarine'); + $custom_theme = variable_get('theme_default', 'garland'); } init_theme(); diff --git a/modules/system/system.install b/modules/system/system.install index 5291c0d9e..ddb6f0fd5 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -1719,12 +1719,12 @@ function system_update_144() { } function system_update_145() { - $default_theme = variable_get('theme_default', 'bluemarine'); + $default_theme = variable_get('theme_default', 'garland'); $themes = list_themes(); if (!array_key_exists($default_theme, $themes)) { - variable_set('theme_default', 'bluemarine'); - $default_theme = 'bluemarine'; + variable_set('theme_default', 'garland'); + $default_theme = 'garland'; } $ret = array(); diff --git a/modules/system/system.module b/modules/system/system.module index 2705043f3..5618f9545 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -494,13 +494,13 @@ function system_theme_select_form($description = '', $default_value = '', $weigh foreach ($enabled as $info) { // For the default theme, revert to an empty string so the user's theme updates when the site theme is changed. - $info->key = $info->name == variable_get('theme_default', 'bluemarine') ? '' : $info->name; + $info->key = $info->name == variable_get('theme_default', 'garland') ? '' : $info->name; $info->screenshot = dirname($info->filename) . '/screenshot.png'; $screenshot = file_exists($info->screenshot) ? theme('image', $info->screenshot, t('Screenshot for %theme theme', array('%theme' => $info->name)), '', array('class' => 'screenshot'), FALSE) : t('no screenshot'); $form['themes'][$info->key]['screenshot'] = array('#value' => $screenshot); - $form['themes'][$info->key]['description'] = array('#type' => 'item', '#title' => $info->name, '#value' => dirname($info->filename) . ($info->name == variable_get('theme_default', 'bluemarine') ? t('<br /> <em>(site default theme)</em>') : '')); + $form['themes'][$info->key]['description'] = array('#type' => 'item', '#title' => $info->name, '#value' => dirname($info->filename) . ($info->name == variable_get('theme_default', 'garland') ? t('<br /> <em>(site default theme)</em>') : '')); $options[$info->key] = ''; } @@ -1034,7 +1034,7 @@ function system_default_region($theme) { function system_initialize_theme_blocks($theme) { // Initialize theme's blocks if none already registered. if (!(db_num_rows(db_query("SELECT module FROM {blocks} WHERE theme = '%s'", $theme)))) { - $default_theme = variable_get('theme_default', 'bluemarine'); + $default_theme = variable_get('theme_default', 'garland'); $regions = system_region_list($theme); $result = db_query("SELECT * FROM {blocks} WHERE theme = '%s'", $default_theme); while($block = db_fetch_array($result)) { @@ -1139,7 +1139,7 @@ function system_themes() { } $form['status'] = array('#type' => 'checkboxes', '#options' => $options, '#default_value' => $status); - $form['theme_default'] = array('#type' => 'radios', '#options' => $options, '#default_value' => variable_get('theme_default', 'bluemarine')); + $form['theme_default'] = array('#type' => 'radios', '#options' => $options, '#default_value' => variable_get('theme_default', 'garland')); $form['buttons']['submit'] = array('#type' => 'submit', '#value' => t('Save configuration') ); $form['buttons']['reset'] = array('#type' => 'submit', '#value' => t('Reset to defaults') ); @@ -1196,7 +1196,7 @@ function system_themes_submit($form_id, $form_values) { } else { variable_del('theme_default'); - db_query("UPDATE {system} SET status = 1 WHERE type = 'theme' AND name = 'bluemarine'"); + db_query("UPDATE {system} SET status = 1 WHERE type = 'theme' AND name = 'garland'"); } menu_rebuild(); diff --git a/sites/default/settings.php b/sites/default/settings.php index 5fe047700..854bbec9a 100644 --- a/sites/default/settings.php +++ b/sites/default/settings.php @@ -143,7 +143,7 @@ ini_set('url_rewriter.tags', ''); */ # $conf = array( # 'site_name' => 'My Drupal site', -# 'theme_default' => 'pushbutton', +# 'theme_default' => 'minnelli', # 'anonymous' => 'Visitor', # ); |