Index: poll.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll.module,v
retrieving revision 1.152
diff -u -w -b -r1.152 poll.module
--- poll.module	15 Dec 2004 21:19:42 -0000	1.152
+++ poll.module	25 Dec 2004 11:28:32 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: poll.module,v 1.152 2004/12/15 21:19:42 dries Exp $
+/* $Id$ */

 /**
  * @file
@@ -50,8 +50,9 @@
       return $blocks;
     }
     else if ($op == 'view') {
-      // Retrieve the latest poll.
-      $timestamp = db_result(db_query('SELECT MAX(n.created) FROM {node} n '. node_access_join_sql() ." WHERE n.type = 'poll' AND n.status = 1 AND ". node_access_where_sql() .' AND n.moderate = 0'));
+      // Retrieve the latest active poll.
+      $timestamp = db_result(db_query('SELECT MAX(n.created) FROM {node} n JOIN poll p on p.nid=n.nid '. node_access_join_sql() ." WHERE n.type = 'poll' AND n.status = 1 AND p.active = 1 AND ". node_access_where_sql() .' AND n.moderate = 0'));
+
       if ($timestamp) {
         $poll = node_load(array('type' => 'poll', 'created' => $timestamp, 'moderate' => 0, 'status' => 1));