? Drupal.remove.bluemarine.traces.patch
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.318
diff -u -r1.318 theme.inc
--- includes/theme.inc	22 Oct 2006 08:28:44 -0000	1.318
+++ includes/theme.inc	7 Nov 2006 23:09:11 -0000
@@ -42,7 +42,7 @@
 
   // 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.
Index: modules/block/block.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.module,v
retrieving revision 1.231
diff -u -r1.231 block.module
--- modules/block/block.module	31 Oct 2006 08:06:18 -0000	1.231
+++ modules/block/block.module	7 Nov 2006 23:09:11 -0000
@@ -88,7 +88,7 @@
       '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 @@
     $custom_theme = $theme;
   }
   else {
-    $custom_theme = variable_get('theme_default', 'bluemarine');
+    $custom_theme = variable_get('theme_default', 'garland');
   }
   init_theme();
 
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.38
diff -u -r1.38 system.install
--- modules/system/system.install	7 Nov 2006 12:02:56 -0000	1.38
+++ modules/system/system.install	7 Nov 2006 23:09:13 -0000
@@ -1719,12 +1719,12 @@
 }
 
 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();
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.390
diff -u -r1.390 system.module
--- modules/system/system.module	31 Oct 2006 08:06:18 -0000	1.390
+++ modules/system/system.module	7 Nov 2006 23:09:15 -0000
@@ -494,13 +494,13 @@
 
       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_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 @@
   }
 
   $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 @@
   }
   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();
Index: sites/default/settings.php
===================================================================
RCS file: /cvs/drupal/drupal/sites/default/settings.php,v
retrieving revision 1.33
diff -u -r1.33 settings.php
--- sites/default/settings.php	3 Aug 2006 01:12:03 -0000	1.33
+++ sites/default/settings.php	7 Nov 2006 23:09:15 -0000
@@ -143,7 +143,7 @@
  */
 # $conf = array(
 #   'site_name' => 'My Drupal site',
-#   'theme_default' => 'pushbutton',
+#   'theme_default' => 'minnelli',
 #   'anonymous' => 'Visitor',
 # );