Commit 88490f64 authored by Dries's avatar Dries
Browse files

- Patch #47691 by Cvbge: quickfix postgresql

parent 51f8d2f3
...@@ -708,7 +708,7 @@ function forum_get_forums($tid = 0) { ...@@ -708,7 +708,7 @@ function forum_get_forums($tid = 0) {
* than NODE_NEW_LIMIT. * than NODE_NEW_LIMIT.
*/ */
function _forum_topics_unread($term, $uid) { function _forum_topics_unread($term, $uid) {
$sql = 'SELECT COUNT(n.nid) FROM {node} n INNER JOIN {term_node} tn ON n.nid = tn.nid AND tn.tid = %d LEFT JOIN {history} h ON n.nid = h.nid AND h.uid = %d WHERE n.status = 1 AND n.type = "forum" AND n.created > %d AND h.nid IS NULL'; $sql = "SELECT COUNT(n.nid) FROM {node} n INNER JOIN {term_node} tn ON n.nid = tn.nid AND tn.tid = %d LEFT JOIN {history} h ON n.nid = h.nid AND h.uid = %d WHERE n.status = 1 AND n.type = 'forum' AND n.created > %d AND h.nid IS NULL";
$sql = db_rewrite_sql($sql); $sql = db_rewrite_sql($sql);
return db_result(db_query($sql, $term, $uid, NODE_NEW_LIMIT)); return db_result(db_query($sql, $term, $uid, NODE_NEW_LIMIT));
} }
......
...@@ -708,7 +708,7 @@ function forum_get_forums($tid = 0) { ...@@ -708,7 +708,7 @@ function forum_get_forums($tid = 0) {
* than NODE_NEW_LIMIT. * than NODE_NEW_LIMIT.
*/ */
function _forum_topics_unread($term, $uid) { function _forum_topics_unread($term, $uid) {
$sql = 'SELECT COUNT(n.nid) FROM {node} n INNER JOIN {term_node} tn ON n.nid = tn.nid AND tn.tid = %d LEFT JOIN {history} h ON n.nid = h.nid AND h.uid = %d WHERE n.status = 1 AND n.type = "forum" AND n.created > %d AND h.nid IS NULL'; $sql = "SELECT COUNT(n.nid) FROM {node} n INNER JOIN {term_node} tn ON n.nid = tn.nid AND tn.tid = %d LEFT JOIN {history} h ON n.nid = h.nid AND h.uid = %d WHERE n.status = 1 AND n.type = 'forum' AND n.created > %d AND h.nid IS NULL";
$sql = db_rewrite_sql($sql); $sql = db_rewrite_sql($sql);
return db_result(db_query($sql, $term, $uid, NODE_NEW_LIMIT)); return db_result(db_query($sql, $term, $uid, NODE_NEW_LIMIT));
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment