Index: democracy_forum.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/democracy_forum/democracy_forum.module,v
retrieving revision 1.1.2.5
diff -u -u -p -r1.1.2.5 democracy_forum.module
--- democracy_forum.module	17 Dec 2007 10:57:14 -0000	1.1.2.5
+++ democracy_forum.module	14 Jan 2008 16:29:13 -0000
@@ -18,7 +18,7 @@ function democracy_forum_block($op = 'li
     return $blocks;
   }
   // Only show the blocks if we are on a node and a council term is found.
-  else if ($op == 'view' && user_access('access content') && arg(0) == 'node' && is_numeric(arg(1)) && $term = democracy_forum_council_get_term(arg(1))) {
+  else if ($op == 'view' && user_access('access content') && arg(0) == 'node' && is_numeric(arg(1)) && $term = democracy_forum_get_term(arg(1))) {
     switch ($delta) {
       case 1:
         $block['subject'] = t('Other issues in this council meeting');
@@ -341,12 +341,14 @@ function theme_democracy_forum_council_s
   return $output;
 }
 
-function democracy_forum_council_get_term($nid) {
-  $vid = variable_get('democracy_forum_council_vocabulary', '');
-  $term = taxonomy_node_get_terms_by_vocabulary($nid, $vid);
-  if($term) {
-    $first_term = array_shift($term);
-    return $first_term;
+function democracy_forum_get_term($nid) {
+  foreach (array('council', 'proposal') as $vocab) {
+    $vid = variable_get('democracy_forum_'. $vocab .'_vocabulary', '');
+    $term = taxonomy_node_get_terms_by_vocabulary($nid, $vid);
+    if ($term) {
+      $first_term = array_shift($term);
+      return $first_term;
+    }
   }
 }