--- /home/stokito/Desktop/template.php	2008-07-19 23:55:55.000000000 +0300
+++ /var/www/drupal-6.3/sites/default/themes/zen/zen/template.php	2008-07-19 23:41:07.000000000 +0300
@@ -1,5 +1,5 @@
 <?php
-// $Id: template.php,v 1.22 2008/05/14 14:39:20 johnalbin Exp $
+// $Id: template.php,v 1.23 2008/05/20 13:12:07 johnalbin Exp $
 
 /**
  * @file
@@ -435,11 +435,12 @@ function zen_settings_init($theme) {
       unset($settings['toggle_node_info_' . $type]);
     }
   }
+
+  if (is_array($defaults)) {
+    $settings = array_merge($defaults, $settings); 
+  }
   // Save default theme settings.
-  variable_set(
-    str_replace('/', '_', 'theme_' . $theme . '_settings'),
-    array_merge($defaults, $settings)
-  );
+  variable_set(str_replace('/', '_', 'theme_' . $theme . '_settings'), $settings);
   // Force refresh of Drupal internals.
   theme_get_setting('', TRUE);
 }