Index: advpoll.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/advpoll/advpoll.module,v
retrieving revision 1.21.2.9
diff -u -r1.21.2.9 advpoll.module
--- advpoll.module	5 Dec 2006 21:02:28 -0000	1.21.2.9
+++ advpoll.module	5 Dec 2006 21:05:27 -0000
@@ -1006,7 +1006,7 @@
   // Previewing a node, so don't show results
   if ($node->in_preview) {
     // Show the voting form but don't let them vote
-    $node->content['body'] = array(
+    $node->content['poll'] = array(
       '#value' => drupal_get_form('advpoll_voting_' . $mode . '_form', $node, $teaser, $page, $block),
     );
   }
@@ -1018,7 +1018,7 @@
       $node->links[] = _advpoll_block_resultslink($node);
     }
 
-    $node->content['body'] = array(
+    $node->content['poll'] = array(
       '#value' => drupal_get_form('advpoll_voting_' . $node->mode . '_form',
         $node, $teaser, $page, $block)
     );
@@ -1033,12 +1033,12 @@
   }
   else {
     // Show results only if the user has voted or poll is closed
-    $node->content['body'] = array(
+    $node->content['poll'] = array(
       '#value' => advpoll_view_results($node, $teaser, $page, $block)
     );  
   }
 
-  return $node;
+  return node_prepare($node, $teaser);
 }
 
 function _advpoll_block_resultslink($node) {