- #14767: Do not display poll block when no polls are active

- Change double to single quotes.

1 files changed, 2 insertions, 2 deletions

diff --git a/modules/poll.module b/modules/poll.module
index ee7bcfdcf..1e2a74c66 100644
--- a/modules/poll.module
+++ b/modules/poll.module
@@ -51,7 +51,7 @@ function poll_block($op = 'list', $delta = 0) {
     }
     else if ($op == 'view') {
       // Retrieve the latest poll.
-      $sql = db_rewrite_sql("SELECT MAX(n.created) FROM {node} n WHERE n.type = 'poll' AND n.status = 1 AND n.moderate = 0");
+      $sql = db_rewrite_sql("SELECT MAX(n.created) FROM {node} n INNER JOIN {poll} p ON p.nid = n.nid WHERE n.status = 1 AND p.active = 1 AND n.moderate = 0");
       $timestamp = db_result(db_query($sql));
       if ($timestamp) {
         $poll = node_load(array('type' => 'poll', 'created' => $timestamp, 'moderate' => 0, 'status' => 1));
@@ -74,7 +74,7 @@ function poll_block($op = 'list', $delta = 0) {
  * Closes polls that have exceeded their allowed runtime.
  */
 function poll_cron() {
-  $result = db_query("SELECT p.nid FROM {poll} p INNER JOIN {node} n ON p.nid=n.nid WHERE (n.created + p.runtime) < '". time() ."' AND p.active = '1' AND p.runtime != '0'");
+  $result = db_query('SELECT p.nid FROM {poll} p INNER JOIN {node} n ON p.nid = n.nid WHERE (n.created + p.runtime) < '. time() .' AND p.active = 1 AND p.runtime != 0');
   while ($poll = db_fetch_object($result)) {
     db_query("UPDATE {poll} SET active='0' WHERE nid = %d", $poll->nid);
   }