--- /cvs/drupal/contributions/themes/acquia_marina/theme-settings.php	2008/10/07 03:48:51	1.1.2.1
+++ /cvs/drupal/contributions/themes/acquia_marina/theme-settings.php	2008/12/06 09:26:14	1.1.2.2
@@ -1,5 +1,5 @@
 <?php
-// $Id$
+// $Id: theme-settings.php,v 1.1.2.1 2008/10/07 03:48:51 jwolf Exp $
 
 /**
 * Implementation of THEMEHOOK_settings() function.
@@ -330,15 +330,14 @@
       $vocabs = array();
       $vocabs_by_type = ($type == 'default') ? taxonomy_get_vocabularies() : taxonomy_get_vocabularies($type);
       foreach ($vocabs_by_type as $key => $value) {
-        $vocabs[] = $value->name;
+        $vocabs[$value->vid] = $value->name;
       }
       // Display taxonomy checkboxes
-      foreach ($vocabs as $vocab_name) {
-        $vocab_name_safe = str_replace(' ', '_', $vocab_name);
-        $form['tnt_container']['node_type_specific']['display_taxonomy_container']['display_taxonomy'][$type]["taxonomy_vocab_display_{$type}_{$vocab_name_safe}"] = array(
+      foreach ($vocabs as $key => $vocab_name) {
+        $form['tnt_container']['node_type_specific']['display_taxonomy_container']['display_taxonomy'][$type]["taxonomy_vocab_display_{$type}_{$key}"] = array(
           '#type'          => 'checkbox',
           '#title'         => t('Display vocabulary: '. $vocab_name),
-          '#default_value' => $settings["taxonomy_vocab_display_{$type}_{$vocab_name_safe}"], 
+          '#default_value' => $settings["taxonomy_vocab_display_{$type}_{$key}"], 
         );
       }
       // Options for default settings