Index: decisions.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/decisions/decisions.module,v
retrieving revision 1.113
diff -u -r1.113 decisions.module
--- decisions.module    31 Oct 2006 03:54:32 -0000      1.113
+++ decisions.module    31 Oct 2006 04:46:13 -0000
@@ -651,10 +651,8 @@
 /**
  * Implementation of hook_view().
  */
-function decisions_view(&$node, $teaser = FALSE, $page = FALSE, $block = FALSE) {
-  if (!$block) {
-    $node = node_prepare($node, $teaser);
-  }
+function decisions_nodeapi(&$node, $op, $teaser = FALSE, $page = FALSE) {
+  if ($op == 'view') {
   $mode = _decisions_get_mode($node);

   // Record the vote if they voted
@@ -673,33 +671,28 @@
   // Previewing a node, so don't show results
   if ($node->in_preview) {
     // Show the voting form but don't let them vote
-    $output .= decisions_view_voting($node, $teaser, $page, $block);
+    $output .= decisions_view_voting($node, $teaser, $page, false);
   }
   else if (!$node->voted && arg(2) != 'results' && $node->active && decisions_eligible($node)) {
     // User hasn't voted and we're not on the results tab
     if (!$valid) {
-      $output .= decisions_view_voting($node, $teaser, $page, $block);
+      $output .= decisions_view_voting($node, $teaser, $page, false);
       $output .= decisions_view_electoral_list($node, $teaser);
     }
   }
   else if (_decisions_can_view_results($node)) {
     // show results only if the user has voted or decision is closed
-    $output .= decisions_view_results($node, $teaser, $page, $block);
+    $output .= decisions_view_results($node, $teaser, $page, false);
     $output .= decisions_view_electoral_list($node, $teaser);
   }

-  if (isset($node->voted) && $node->voted && user_access('cancel own vote') && $node->active && !$block) {
+  if (isset($node->voted) && $node->voted && user_access('cancel own vote') && $node->active) {
     $output .= drupal_get_form('decisions_cancel', decisions_cancel_form($node->nid));
   }

-  if ($block) {
-    $output = '<div class="title">' . $node->title . '</div>' . $output;
-    $output .= l(t('view decision'), 'node/' . $node->nid);
-    return $output;
-  }
-  else {
-    $node->body .= $output;
-    $node->teaser .= $output;
+  $node->body .= $output;
+  $node->teaser .= $output;
+  return $node;
   }

 }
@@ -771,7 +764,7 @@

   $mode = _decisions_get_mode($node);
   if (function_exists("decisions_view_voting_$mode")) {
-    return call_user_func("decisions_view_voting_$mode", $node, $teaser, $page, $block);
+    return drupal_get_form("decisions_view_voting_$mode", $node, $teaser, $page, $block);
   }
   else {
     _decisions_panic_on_mode($mode);
cvs diff: Diffing modes
Index: modes/poll.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/decisions/modes/poll.inc,v
retrieving revision 1.10
diff -u -r1.10 poll.inc
--- modes/poll.inc      31 Oct 2006 01:23:46 -0000      1.10
+++ modes/poll.inc      31 Oct 2006 04:46:13 -0000
@@ -63,7 +63,7 @@
                         '#value' => t('Vote')
                         );
   $form['#action'] = url('node/'. $node->nid);
-  return drupal_get_form('decisions_view_voting', $form);
+  return $form;
 }

 /**
Index: modes/ranking.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/decisions/modes/ranking.inc,v
retrieving revision 1.15
diff -u -r1.15 ranking.inc
--- modes/ranking.inc   31 Oct 2006 01:23:46 -0000      1.15
+++ modes/ranking.inc   31 Oct 2006 04:46:13 -0000
@@ -81,7 +81,7 @@
   }

   $form['#action'] = url('node/'. $node->nid);
-  return drupal_get_form('decisions_view_voting', $form);
+  return $form;
 }

 /**