From f520a8b413fb9edd030802fdc6045f00529fa30a Mon Sep 17 00:00:00 2001
From: Steven Wittens <steven@10.no-reply.drupal.org>
Date: Sat, 1 Jun 2002 19:34:32 +0000
Subject: [PATCH] Fixed unmoderated polls already showing up in the side-block.
---
modules/poll.module | 4 ++--
modules/poll/poll.module | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules/poll.module b/modules/poll.module
index 1d5ade5c362d..6f8f5c40388d 100644
--- a/modules/poll.module
+++ b/modules/poll.module
@@ -12,9 +12,9 @@ function poll_access($op, $node) {
}
function poll_block() {
- $timestamp = db_result(db_query("SELECT MAX(created) FROM node WHERE type='poll' AND status='1'"));
+ $timestamp = db_result(db_query("SELECT MAX(created) FROM node WHERE type='poll' AND status='1' AND moderate='0'"));
if ($timestamp) {
- $poll = node_load(array("type" => "poll", "created" => $timestamp, "status" => "1"));
+ $poll = node_load(array("type" => "poll", "created" => $timestamp, "moderate" => "0", "status" => "1"));
if ($poll->nid) {
// Poll_view dumps the output into $poll->body
poll_view($poll, 1, 1);
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index 1d5ade5c362d..6f8f5c40388d 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -12,9 +12,9 @@ function poll_access($op, $node) {
}
function poll_block() {
- $timestamp = db_result(db_query("SELECT MAX(created) FROM node WHERE type='poll' AND status='1'"));
+ $timestamp = db_result(db_query("SELECT MAX(created) FROM node WHERE type='poll' AND status='1' AND moderate='0'"));
if ($timestamp) {
- $poll = node_load(array("type" => "poll", "created" => $timestamp, "status" => "1"));
+ $poll = node_load(array("type" => "poll", "created" => $timestamp, "moderate" => "0", "status" => "1"));
if ($poll->nid) {
// Poll_view dumps the output into $poll->body
poll_view($poll, 1, 1);
--
GitLab