diff options
| -rw-r--r-- | modules/node.module | 2 | ||||
| -rw-r--r-- | modules/node/node.module | 2 | ||||
| -rw-r--r-- | modules/tracker.module | 4 | ||||
| -rw-r--r-- | modules/tracker/tracker.module | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/modules/node.module b/modules/node.module index 1107618ac..da5134dff 100644 --- a/modules/node.module +++ b/modules/node.module @@ -1862,7 +1862,7 @@ function _node_rewrite_sql($query = '', $nid_alias = 'n', $args = array()) { * The original query with JOIN and WHERE statements inserted from hook_node_rewrite_sql implementations. nid is rewritten if needed. */ function node_rewrite_sql($query, $nid_alias = 'n', $args = array()) { - list($join, $where,$nid_to_select) = _node_rewrite_sql($query, $nid_alias, $args); + list($join, $where, $nid_to_select) = _node_rewrite_sql($query, $nid_alias, $args); $query = preg_replace('/(SELECT.*)('. $nid_alias .'\.)?nid(.*FROM)/AUs', '\1'. $nid_to_select .'\3', $query); diff --git a/modules/node/node.module b/modules/node/node.module index 1107618ac..da5134dff 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -1862,7 +1862,7 @@ function _node_rewrite_sql($query = '', $nid_alias = 'n', $args = array()) { * The original query with JOIN and WHERE statements inserted from hook_node_rewrite_sql implementations. nid is rewritten if needed. */ function node_rewrite_sql($query, $nid_alias = 'n', $args = array()) { - list($join, $where,$nid_to_select) = _node_rewrite_sql($query, $nid_alias, $args); + list($join, $where, $nid_to_select) = _node_rewrite_sql($query, $nid_alias, $args); $query = preg_replace('/(SELECT.*)('. $nid_alias .'\.)?nid(.*FROM)/AUs', '\1'. $nid_to_select .'\3', $query); diff --git a/modules/tracker.module b/modules/tracker.module index eff8878bf..db6a9057e 100644 --- a/modules/tracker.module +++ b/modules/tracker.module @@ -73,9 +73,9 @@ function tracker_page($uid = 0) { $output .= ''; if ($uid) { - $sql = 'SELECT n.nid, n.title, n.type, n.changed, n.uid, u.name, l.last_comment_timestamp AS last_post, l.comment_count FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {users} u ON n.uid = u.uid LEFT JOIN {comments} c ON n.nid = c.nid AND c.status = 0 WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d) ORDER BY last_post DESC'; + $sql = 'SELECT n.nid, n.title, n.type, n.changed, n.uid, u.name, l.last_comment_timestamp AS last_post, l.comment_count FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {users} u ON n.uid = u.uid LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = 0 OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d) ORDER BY last_post DESC'; $sql = node_rewrite_sql($sql); - $sql_count = 'SELECT n.nid FROM {node} n LEFT JOIN {comments} c ON n.nid = c.nid AND c.status = 0 WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d)'; + $sql_count = 'SELECT n.nid FROM {node} n LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = 0 OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d)'; $sql_count = node_rewrite_sql($sql_count); $result = pager_query($sql, 25, 0, $sql_count, $uid, $uid); } diff --git a/modules/tracker/tracker.module b/modules/tracker/tracker.module index eff8878bf..db6a9057e 100644 --- a/modules/tracker/tracker.module +++ b/modules/tracker/tracker.module @@ -73,9 +73,9 @@ function tracker_page($uid = 0) { $output .= ''; if ($uid) { - $sql = 'SELECT n.nid, n.title, n.type, n.changed, n.uid, u.name, l.last_comment_timestamp AS last_post, l.comment_count FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {users} u ON n.uid = u.uid LEFT JOIN {comments} c ON n.nid = c.nid AND c.status = 0 WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d) ORDER BY last_post DESC'; + $sql = 'SELECT n.nid, n.title, n.type, n.changed, n.uid, u.name, l.last_comment_timestamp AS last_post, l.comment_count FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {users} u ON n.uid = u.uid LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = 0 OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d) ORDER BY last_post DESC'; $sql = node_rewrite_sql($sql); - $sql_count = 'SELECT n.nid FROM {node} n LEFT JOIN {comments} c ON n.nid = c.nid AND c.status = 0 WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d)'; + $sql_count = 'SELECT n.nid FROM {node} n LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = 0 OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d)'; $sql_count = node_rewrite_sql($sql_count); $result = pager_query($sql, 25, 0, $sql_count, $uid, $uid); } |