diff options
| author | Dries Buytaert <dries@buytaert.net> | 2008-12-03 16:32:22 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2008-12-03 16:32:22 +0000 |
| commit | cadd9bd54ca9b3e5a95661c616d35a1a0045ab46 (patch) | |
| tree | 6594d689ccf40b86fc16cf7f628ef06fa7ee50c7 /modules/tracker | |
| parent | 5c72eb294ab1527b8da1b261cfbffeeb7ff98c9f (diff) | |
| download | brdo-cadd9bd54ca9b3e5a95661c616d35a1a0045ab46.tar.gz brdo-cadd9bd54ca9b3e5a95661c616d35a1a0045ab46.tar.bz2 | |
- Patch #335086 by recidive: rename node, filter and comment module tables to singular for consistency. Oh my.
Diffstat (limited to 'modules/tracker')
| -rw-r--r-- | modules/tracker/tracker.pages.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/tracker/tracker.pages.inc b/modules/tracker/tracker.pages.inc index 5a7fd3f3c..7c55ae48d 100644 --- a/modules/tracker/tracker.pages.inc +++ b/modules/tracker/tracker.pages.inc @@ -22,9 +22,9 @@ function tracker_page($account = NULL, $set_title = FALSE) { drupal_set_title($account->name); } // TODO: These queries are very expensive, see http://drupal.org/node/105639 - $sql = 'SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.uid, u.name, GREATEST(n.changed, l.last_comment_timestamp) AS last_updated, 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 = %d OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d) ORDER BY last_updated DESC'; + $sql = 'SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.uid, u.name, GREATEST(n.changed, l.last_comment_timestamp) AS last_updated, 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 {comment} c ON n.nid = c.nid AND (c.status = %d OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d) ORDER BY last_updated DESC'; $sql = db_rewrite_sql($sql); - $sql_count = 'SELECT COUNT(DISTINCT(n.nid)) FROM {node} n LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = %d OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d)'; + $sql_count = 'SELECT COUNT(DISTINCT(n.nid)) FROM {node} n LEFT JOIN {comment} c ON n.nid = c.nid AND (c.status = %d OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d)'; $sql_count = db_rewrite_sql($sql_count); $result = pager_query($sql, 25, 0, $sql_count, COMMENT_PUBLISHED, $account->uid, $account->uid); } |