Index: faq.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/faq/faq.module,v
retrieving revision 1.1.4.63.2.8
diff -u -r1.1.4.63.2.8 faq.module
--- faq.module  17 Dec 2007 14:05:51 -0000      1.1.4.63.2.8
+++ faq.module  31 Dec 2007 11:47:08 -0000
@@ -457,6 +457,9 @@
     foreach ($vocabularies as $vid => $vobj) {
       $tree = taxonomy_get_tree($vid);
       foreach ($tree as $term) {
+        if (!taxonomy_term_count_nodes($term->tid, 'faq')) {
+          continue;
+        }
         $options[$term->tid] = $term->name;
         $form['choose_cat']['faq_category'] = array(
           '#type' => 'select',
@@ -1684,7 +1687,9 @@
             $terms = array();
             foreach (taxonomy_get_vocabularies('faq') as $vocab) {
               foreach (taxonomy_get_tree($vocab->vid) as $term) {
-                $terms[$term->name] = $term->tid;
+                if (taxonomy_term_count_nodes($term->tid, 'faq')) {
+                  $terms[$term->name] = $term->tid;
+                }
               }
             }
             if (sizeof($terms) > 0) {
@@ -1912,7 +1917,7 @@
       $tid = str_replace('taxonomy/term/', '', $link['href']);
       $term = taxonomy_get_term($tid);
       foreach ($vocabularies as $vid => $vobj) {
-        if ($term->vid == $vid) {
+        if ($term->vid == $vid && taxonomy_term_count_nodes($term->tid, 'faq')) {
           $links[$module]['href'] = str_replace('taxonomy/term', 'faq', $link['href']);
           break;
         }