From 00728553408e0ba35ed245d36653c776e687cd6c Mon Sep 17 00:00:00 2001
From: Kjartan Mannes <kjartan@2.no-reply.drupal.org>
Date: Wed, 12 Jun 2002 12:35:01 +0000
Subject: [PATCH] - made poll_page() SQL query valid when running MySQL in ANSI
mode.
---
modules/poll.module | 2 +-
modules/poll/poll.module | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/poll.module b/modules/poll.module
index 5934d99f0f5b..0249d8bae105 100644
--- a/modules/poll.module
+++ b/modules/poll.module
@@ -216,7 +216,7 @@ function poll_page() {
global $theme;
$theme->header();
- $result = db_query("SELECT n.nid, n.title, p.active, SUM(c.chvotes) AS votes FROM node n LEFT JOIN poll p ON n.nid=p.nid LEFT JOIN poll_choices c ON n.nid=c.nid WHERE type='poll' AND status='1' AND moderate='0' GROUP BY n.nid ORDER BY n.created DESC");
+ $result = db_query("SELECT n.nid, n.title, p.active, SUM(c.chvotes) AS votes FROM node n LEFT JOIN poll p ON n.nid=p.nid LEFT JOIN poll_choices c ON n.nid=c.nid WHERE type='poll' AND status='1' AND moderate='0' GROUP BY n.nid, n.title, p.active ORDER BY n.created DESC");
while ($node = db_fetch_object($result)) {
$output .= "<li>". l($node->title, array("id" => $node->nid)) ." - ". format_plural($node->votes, "vote", "votes") ." - ". ($node->active ? t("open") : t("closed")) ."</li>";
}
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index 5934d99f0f5b..0249d8bae105 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -216,7 +216,7 @@ function poll_page() {
global $theme;
$theme->header();
- $result = db_query("SELECT n.nid, n.title, p.active, SUM(c.chvotes) AS votes FROM node n LEFT JOIN poll p ON n.nid=p.nid LEFT JOIN poll_choices c ON n.nid=c.nid WHERE type='poll' AND status='1' AND moderate='0' GROUP BY n.nid ORDER BY n.created DESC");
+ $result = db_query("SELECT n.nid, n.title, p.active, SUM(c.chvotes) AS votes FROM node n LEFT JOIN poll p ON n.nid=p.nid LEFT JOIN poll_choices c ON n.nid=c.nid WHERE type='poll' AND status='1' AND moderate='0' GROUP BY n.nid, n.title, p.active ORDER BY n.created DESC");
while ($node = db_fetch_object($result)) {
$output .= "<li>". l($node->title, array("id" => $node->nid)) ." - ". format_plural($node->votes, "vote", "votes") ." - ". ($node->active ? t("open") : t("closed")) ."</li>";
}
--
GitLab