- Fixed the remaining SQL problems when running MySQL in ANSI mode.
(moderation/comment related)4.0.x
Dries Buytaert
parent
73d61b7839
commit
0a5e1828f4
|
|
@ -176,13 +176,13 @@ function comment_order($order) {
|
|||
|
||||
function comment_query($lid, $order, $pid = -1) {
|
||||
|
||||
$query .= "SELECT u.*, c.*, SUM(m.score) / COUNT(m.cid) AS score, COUNT(m.cid) AS votes FROM comments c LEFT JOIN users u ON c.author = u.uid LEFT JOIN moderate m ON c.cid = m.cid WHERE c.lid = '$lid'";
|
||||
$query .= "SELECT c.cid, c.pid, c.lid, c.subject, c.comment, c.timestamp, u.uid, u.name, AVG(m.score) AS score, COUNT(m.cid) AS votes FROM comments c LEFT JOIN users u ON c.author = u.uid LEFT JOIN moderate m ON c.cid = m.cid WHERE c.lid = '$lid'";
|
||||
|
||||
if ($pid >= 0) {
|
||||
$query .= " AND pid = '$pid'";
|
||||
}
|
||||
|
||||
$query .= " GROUP BY c.cid";
|
||||
$query .= " GROUP BY c.cid, c.pid, c.lid, c.subject, c.comment, c.timestamp, u.uid, u.name";
|
||||
|
||||
if ($order == 1) {
|
||||
$query .= " ORDER BY c.timestamp DESC";
|
||||
|
|
@ -235,7 +235,7 @@ function comment_view($comment, $folded = 0) {
|
|||
function comment_thread_min($cid, $threshold) {
|
||||
global $user;
|
||||
|
||||
$result = db_query("SELECT u.*, c.*, SUM(m.score) / COUNT(m.cid) AS score, COUNT(m.cid) AS votes FROM comments c LEFT JOIN users u ON c.author = u.uid LEFT JOIN moderate m ON c.cid = m.cid WHERE c.pid = '$cid' GROUP BY c.cid ORDER BY c.timestamp, c.cid");
|
||||
$result = db_query("SELECT c.cid, c.pid, c.lid, c.subject, c.comment, c.timestamp, u.uid, u.name, AVG(m.score) AS score, COUNT(m.cid) AS votes FROM comments c LEFT JOIN users u ON c.author = u.uid LEFT JOIN moderate m ON c.cid = m.cid WHERE c.pid = '$cid' GROUP BY c.cid, c.pid, c.lid, c.subject, c.comment, c.timestamp, u.uid, u.name ORDER BY c.timestamp");
|
||||
|
||||
while ($comment = db_fetch_object($result)) {
|
||||
print "<ul>";
|
||||
|
|
@ -257,7 +257,7 @@ function comment_thread_max($cid, $mode, $threshold, $level = 0, $dummy = 0) {
|
|||
** in terms of speed and size.
|
||||
*/
|
||||
|
||||
$result = db_query("SELECT u.*, c.*, SUM(m.score) / COUNT(m.cid) AS score, COUNT(m.cid) AS votes FROM comments c LEFT JOIN users u ON c.author = u.uid LEFT JOIN moderate m ON c.cid = m.cid WHERE c.pid = '$cid' GROUP BY c.cid ORDER BY c.timestamp, c.cid");
|
||||
$result = db_query("SELECT c.cid, c.pid, c.lid, c.subject, c.comment, c.timestamp, u.uid, u.name, AVG(m.score) AS score, COUNT(m.cid) AS votes FROM comments c LEFT JOIN users u ON c.author = u.uid LEFT JOIN moderate m ON c.cid = m.cid WHERE c.pid = '$cid' GROUP BY c.cid, c.pid, c.lid, c.subject, c.comment, c.timestamp, u.uid, u.name ORDER BY c.timestamp");
|
||||
|
||||
while ($comment = db_fetch_object($result)) {
|
||||
print "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\"><tr><td width=\"". ($level * 25) ."\"> </td><td>\n";
|
||||
|
|
@ -307,7 +307,7 @@ function comment_render($lid, $cid) {
|
|||
$theme->box(t("Control panel"), $theme->comment_controls($threshold, $mode, $order));
|
||||
|
||||
if ($cid > 0) {
|
||||
$result = db_query("SELECT u.*, c.*, SUM(m.score) / COUNT(m.cid) AS score, COUNT(m.cid) AS votes FROM comments c LEFT JOIN users u ON c.author = u.uid LEFT JOIN moderate m ON c.cid = m.cid WHERE c.cid = '$cid' GROUP BY c.cid");
|
||||
$result = db_query("SELECT c.cid, c.pid, c.lid, c.subject, c.comment, c.timestamp, u.uid, u.name, AVG(m.score) AS score, COUNT(m.cid) AS votes FROM comments c LEFT JOIN users u ON c.author = u.uid LEFT JOIN moderate m ON c.cid = m.cid WHERE c.cid = '$cid' GROUP BY c.cid, c.pid, c.lid, c.subject, c.comment, c.timestamp, u.uid, u.name");
|
||||
if ($comment = db_fetch_object($result)) {
|
||||
comment_view($comment, comment_links($comment));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,15 +14,6 @@ function blog_help() {
|
|||
<?php
|
||||
}
|
||||
|
||||
function blog_cron() {
|
||||
$result = db_query("SELECT n.nid, n.timestamp, SUM(m.score) / COUNT(m.cid) AS score, COUNT(m.cid) AS votes FROM node n LEFT JOIN moderate m ON m.nid = n.nid WHERE n.type = 'blog' AND n.status = '". node_status("posted") ."' GROUP BY n.nid, n.title, n.comment, n.timestamp, b.body, u.uid, u.name ORDER BY n.timestamp DESC LIMIT 30");
|
||||
while ($node = db_fetch_object($result)) {
|
||||
if ($node->score > 3 && $node->votes > 4) {
|
||||
db_query("UPDATE node SET promote = '1' WHERE nid = '$node->nid'");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function blog_perm() {
|
||||
return array("administer blogs", "access blogs", "post blogs");
|
||||
}
|
||||
|
|
@ -120,7 +111,6 @@ function blog_page_user($uid = 0, $date = 0) {
|
|||
}
|
||||
|
||||
if ($blog->comment) {
|
||||
$links[] = "<a href=\"node.php?id=$blog->nid\">". t("moderate") ."</a>";
|
||||
$links[] = "<a href=\"node.php?id=$blog->nid\">". format_plural($blog->comments, t("comment"), t("comments")) ."</a>";
|
||||
}
|
||||
|
||||
|
|
@ -157,7 +147,6 @@ function blog_page_last() {
|
|||
}
|
||||
|
||||
if ($blog->comment) {
|
||||
$links[] = "<a href=\"node.php?id=$blog->nid\">". t("moderate") ."</a>";
|
||||
$links[] = "<a href=\"node.php?id=$blog->nid\">". format_plural($blog->comments, t("comment"), t("comments")) ."</a>";
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -14,15 +14,6 @@ function blog_help() {
|
|||
<?php
|
||||
}
|
||||
|
||||
function blog_cron() {
|
||||
$result = db_query("SELECT n.nid, n.timestamp, SUM(m.score) / COUNT(m.cid) AS score, COUNT(m.cid) AS votes FROM node n LEFT JOIN moderate m ON m.nid = n.nid WHERE n.type = 'blog' AND n.status = '". node_status("posted") ."' GROUP BY n.nid, n.title, n.comment, n.timestamp, b.body, u.uid, u.name ORDER BY n.timestamp DESC LIMIT 30");
|
||||
while ($node = db_fetch_object($result)) {
|
||||
if ($node->score > 3 && $node->votes > 4) {
|
||||
db_query("UPDATE node SET promote = '1' WHERE nid = '$node->nid'");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function blog_perm() {
|
||||
return array("administer blogs", "access blogs", "post blogs");
|
||||
}
|
||||
|
|
@ -120,7 +111,6 @@ function blog_page_user($uid = 0, $date = 0) {
|
|||
}
|
||||
|
||||
if ($blog->comment) {
|
||||
$links[] = "<a href=\"node.php?id=$blog->nid\">". t("moderate") ."</a>";
|
||||
$links[] = "<a href=\"node.php?id=$blog->nid\">". format_plural($blog->comments, t("comment"), t("comments")) ."</a>";
|
||||
}
|
||||
|
||||
|
|
@ -157,7 +147,6 @@ function blog_page_last() {
|
|||
}
|
||||
|
||||
if ($blog->comment) {
|
||||
$links[] = "<a href=\"node.php?id=$blog->nid\">". t("moderate") ."</a>";
|
||||
$links[] = "<a href=\"node.php?id=$blog->nid\">". format_plural($blog->comments, t("comment"), t("comments")) ."</a>";
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue