Index: inc/template.preprocess-node.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/adaptivetheme/inc/template.preprocess-node.inc,v
retrieving revision 1.8
diff -u -p -r1.8 template.preprocess-node.inc
--- inc/template.preprocess-node.inc	20 Oct 2009 11:19:51 -0000	1.8
+++ inc/template.preprocess-node.inc	12 Nov 2009 02:02:15 -0000
@@ -83,8 +83,9 @@ $heading_level = $vars['page'] ? 'h2' : 
 if ((module_exists('taxonomy')) && ($taxonomy_display == 'all' || ($taxonomy_display == 'only' && $vars['page']))) {
   $vocabularies = taxonomy_get_vocabularies($vars['node']->type);
   $output = '';
-  $vocab_delimiter = '';
+  $vocab_index = 0;
   foreach ($vocabularies as $vocabulary) {
+    $vocab_index++;
     if (theme_get_setting('taxonomy_vocab_display_'. $taxonomy_content_type .'_'. $vocabulary->vid) == 1) {
       $terms = taxonomy_node_get_terms_by_vocabulary($vars['node'], $vocabulary->vid);
       if ($terms) {
@@ -93,12 +94,13 @@ if ((module_exists('taxonomy')) && ($tax
         $term_index = 0;
         foreach ($terms as $term) {
           $term_index++;
-          $term_delimiter = ($term_index == count($terms)) ? '' : $delimiter ;
-          $links[] = '<li class="vocab-term">'. l($term->name, taxonomy_term_path($term), array('attributes' => array('rel' => 'tag', 'title' => strip_tags($term->description)))) . $term_delimiter .'</li>';
-        }
-        if ($taxonomy_format == 'list') {
-          $output .= $vocab_delimiter;
-          $vocab_delimiter = $delimiter;
+          if (($term_index == count($terms)) && (($taxonomy_format == 'vocab') || ($taxonomy_format == 'list') && ($vocab_index == count($vocabularies)))) {
+            $use_delimiter = FALSE;
+          }
+          else {
+            $use_delimiter = TRUE;
+          }
+          $links[] = '<li class="vocab-term">'. l($term->name, taxonomy_term_path($term), array('attributes' => array('rel' => 'tag', 'title' => strip_tags($term->description)))) .($use_delimiter ? $delimiter :'') .'</li>';
         }
         $output .= implode("", $links);
         $output .= ($taxonomy_format == 'vocab') ? '</ul></li>' : '';