Index: modules/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node.module,v
retrieving revision 1.574
diff -u -r1.574 node.module
--- modules/node.module	27 Dec 2005 14:31:42 -0000	1.574
+++ modules/node.module	28 Dec 2005 15:29:23 -0000
@@ -1012,8 +1012,18 @@
   $form['filters'] = array('#type' => 'fieldset', '#title' => t('Show only items where'), '#theme' => 'node_filters');
   foreach ($session as $filter) {
     list($type, $value) = $filter;
+    unset($term_name);
+    if ($type == 'category') { // term name from tid.
+      foreach ($filters[$type]['options'] as $vocabulary) {
+        if (isset($vocabulary[$value])) {
+          $term_name = $vocabulary[$value];
+          break;
+        }
+      }
+    }
+    $form_value = isset($term_name) ? $term_name : $filters[$type]['options'][$value];
     $string = ($i++ ? '<em>and</em> where <strong>%a</strong> is <strong>%b</strong>' : '<strong>%a</strong> is <strong>%b</strong>');
-    $form['filters']['current'][] = array('#value' => t($string, array('%a' => $filters[$type]['title'] , '%b' => $filters[$type]['options'][$value])));
+    $form['filters']['current'][] = array('#value' => t($string, array('%a' => $filters[$type]['title'] , '%b' => $form_value)));
   }
 
   foreach ($filters as $key => $filter) {
@@ -1060,7 +1070,6 @@
   }
   $output .= '</dd>';
 
-
   $output .= '</dl>';
   $output .= '<div class="container-inline" id="node-admin-buttons">'. form_render($form['buttons']) .'</div>';
   $output .= '</li></ul><br class="clear" />';
@@ -1068,7 +1077,6 @@
   return $output;
 }
 
-
 function node_filter_form_submit() {
   global $form_values;
   $op = $_POST['op'];
@@ -1077,6 +1085,7 @@
     case t('Filter'): case t('Refine'):
       if (isset($form_values['filter'])) {
         $filter = $form_values['filter'];
+        $filters[$filter]['options'] = form_options_flatten($filters[$filter]['options']);
         if (isset($filters[$filter]['options'][$form_values[$filter]])) {
           $_SESSION['node_overview_filter'][] = array($filter, $form_values[$filter]);
         }