Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.384
diff -u -p -r1.384 taxonomy.module
--- modules/taxonomy/taxonomy.module	2 Oct 2007 16:15:56 -0000	1.384
+++ modules/taxonomy/taxonomy.module	10 Oct 2007 11:30:53 -0000
@@ -21,6 +21,9 @@ function taxonomy_theme() {
     'taxonomy_term_select' => array(
       'arguments' => array('element' => NULL),
     ),
+    'taxonomy_term_page' => array(
+      'arguments' => array('tids' => array(), 'result' => NULL),
+    ),
   );
 }
 
Index: modules/taxonomy/taxonomy.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.pages.inc,v
retrieving revision 1.2
diff -u -p -r1.2 taxonomy.pages.inc
--- modules/taxonomy/taxonomy.pages.inc	27 Sep 2007 16:52:00 -0000	1.2
+++ modules/taxonomy/taxonomy.pages.inc	10 Oct 2007 14:11:23 -0000
@@ -40,16 +40,18 @@ function taxonomy_term_page($str_tids = 
           $breadcrumbs = array_reverse($breadcrumbs);
           menu_set_location($breadcrumbs);
 
-          $output = taxonomy_render_nodes(taxonomy_select_nodes($tids, $terms['operator'], $depth, TRUE));
+          $output = theme('taxonomy_term_page', $tids, taxonomy_select_nodes($tids, $terms['operator'], $depth, TRUE));
           drupal_add_feed(url('taxonomy/term/'. $str_tids .'/'. $depth .'/feed'), 'RSS - '. $title);
           return $output;
           break;
 
         case 'feed':
-          $term = taxonomy_get_term($tids[0]);
           $channel['link'] = url('taxonomy/term/'. $str_tids .'/'. $depth, array('absolute' => TRUE));
           $channel['title'] = variable_get('site_name', 'Drupal') .' - '. $title;
-          $channel['description'] = $term->description;
+          if (count($tids) == 1) {
+            $term = taxonomy_get_term($tids[0]);
+            $channel['description'] = check_markup($term->description, FILTER_FORMAT_DEFAULT, FALSE);
+          }
 
           $result = taxonomy_select_nodes($tids, $terms['operator'], $depth, FALSE);
 
@@ -59,6 +61,7 @@ function taxonomy_term_page($str_tids = 
 
           node_feed($items, $channel);
           break;
+
         default:
           drupal_not_found();
       }
@@ -70,6 +73,27 @@ function taxonomy_term_page($str_tids = 
 }
 
 /**
+ * Render a taxonomy term page HTML output.
+ * 
+ * @param array $tids
+ *   An array of term ids.
+ * @param $result
+ *   A pager_query() result, such as that performed by taxonomy_select_nodes().
+ */
+function theme_taxonomy_term_page($tids, $result) {
+  $output = '';
+  
+  if (count($tids) == 1) {
+    $term = taxonomy_get_term($tids[0]);
+    $output .= check_markup($term->description, FILTER_FORMAT_DEFAULT, FALSE);
+  }
+  
+  $output .= taxonomy_render_nodes($result);
+  
+  return $output;
+}
+
+/**
  * Helper function for autocompletion
  */
 function taxonomy_autocomplete($vid, $string = '') {