diff options
| author | Steven Wittens <steven@10.no-reply.drupal.org> | 2005-03-18 08:57:52 +0000 |
|---|---|---|
| committer | Steven Wittens <steven@10.no-reply.drupal.org> | 2005-03-18 08:57:52 +0000 |
| commit | ea5e9704a2877351e68ed37cd03375384232829b (patch) | |
| tree | a2ab004f3a0b9cf95117c47434e54f184b1fe12e | |
| parent | e6b14d26156bfbe87d55860cc1ae1bef6b4fc20e (diff) | |
| download | brdo-ea5e9704a2877351e68ed37cd03375384232829b.tar.gz brdo-ea5e9704a2877351e68ed37cd03375384232829b.tar.bz2 | |
- #14767: Do not display poll block when no polls are active
- Change double to single quotes.
| -rw-r--r-- | modules/poll.module | 4 | ||||
| -rw-r--r-- | modules/poll/poll.module | 4 |
2 files changed, 4 insertions, 4 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); } diff --git a/modules/poll/poll.module b/modules/poll/poll.module index ee7bcfdcf..1e2a74c66 100644 --- a/modules/poll/poll.module +++ b/modules/poll/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); } |