diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/node.module | 2 | ||||
| -rw-r--r-- | modules/node/node.module | 2 | ||||
| -rw-r--r-- | modules/search.module | 2 | ||||
| -rw-r--r-- | modules/search/search.module | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/modules/node.module b/modules/node.module index 6deb1d2d3..bc0f77105 100644 --- a/modules/node.module +++ b/modules/node.module @@ -582,7 +582,7 @@ function node_search($op = 'search', $keys = null) { case 'status': $last = variable_get('node_cron_last', 0); $total = db_result(db_query('SELECT COUNT(*) FROM {node} WHERE status = 1 AND moderate = 0')); - $remaining = db_result(db_query('SELECT COUNT(*) FROM {node} n LEFT JOIN {node_comment_statistics} c ON n.nid = c.nid WHERE n.status = 1 AND n.moderate = 0 AND (n.created > %d OR n.changed > %d OR c.last_comment_timestamp > %d) ORDER BY GREATEST(n.created, n.changed, c.last_comment_timestamp) ASC', $last, $last, $last)); + $remaining = db_result(db_query('SELECT COUNT(*) FROM {node} n LEFT JOIN {node_comment_statistics} c ON n.nid = c.nid WHERE n.status = 1 AND n.moderate = 0 AND (n.created > %d OR n.changed > %d OR c.last_comment_timestamp > %d)', $last, $last, $last)); return array('remaining' => $remaining, 'total' => $total); case 'search': list($join, $where) = _db_rewrite_sql(); diff --git a/modules/node/node.module b/modules/node/node.module index 6deb1d2d3..bc0f77105 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -582,7 +582,7 @@ function node_search($op = 'search', $keys = null) { case 'status': $last = variable_get('node_cron_last', 0); $total = db_result(db_query('SELECT COUNT(*) FROM {node} WHERE status = 1 AND moderate = 0')); - $remaining = db_result(db_query('SELECT COUNT(*) FROM {node} n LEFT JOIN {node_comment_statistics} c ON n.nid = c.nid WHERE n.status = 1 AND n.moderate = 0 AND (n.created > %d OR n.changed > %d OR c.last_comment_timestamp > %d) ORDER BY GREATEST(n.created, n.changed, c.last_comment_timestamp) ASC', $last, $last, $last)); + $remaining = db_result(db_query('SELECT COUNT(*) FROM {node} n LEFT JOIN {node_comment_statistics} c ON n.nid = c.nid WHERE n.status = 1 AND n.moderate = 0 AND (n.created > %d OR n.changed > %d OR c.last_comment_timestamp > %d)', $last, $last, $last)); return array('remaining' => $remaining, 'total' => $total); case 'search': list($join, $where) = _db_rewrite_sql(); diff --git a/modules/search.module b/modules/search.module index 5e519a4e0..1327e8bb7 100644 --- a/modules/search.module +++ b/modules/search.module @@ -511,7 +511,7 @@ function do_search($keys, $type, $join = '', $where = '1') { $count_query = "SELECT $count"; // Do pager query - $query = "SELECT i.type, i.sid, i.word, SUM(i.score/t.count) AS score FROM {search_index} i $join INNER JOIN {search_total} t ON i.word = t.word WHERE $where GROUP BY i.type, i.sid ORDER BY score DESC"; + $query = "SELECT i.type, i.sid, SUM(i.score/t.count) AS score FROM {search_index} i $join INNER JOIN {search_total} t ON i.word = t.word WHERE $where GROUP BY i.type, i.sid ORDER BY score DESC"; $result = pager_query($query, 15, 0, $count_query, $arguments); $results = array(); diff --git a/modules/search/search.module b/modules/search/search.module index 5e519a4e0..1327e8bb7 100644 --- a/modules/search/search.module +++ b/modules/search/search.module @@ -511,7 +511,7 @@ function do_search($keys, $type, $join = '', $where = '1') { $count_query = "SELECT $count"; // Do pager query - $query = "SELECT i.type, i.sid, i.word, SUM(i.score/t.count) AS score FROM {search_index} i $join INNER JOIN {search_total} t ON i.word = t.word WHERE $where GROUP BY i.type, i.sid ORDER BY score DESC"; + $query = "SELECT i.type, i.sid, SUM(i.score/t.count) AS score FROM {search_index} i $join INNER JOIN {search_total} t ON i.word = t.word WHERE $where GROUP BY i.type, i.sid ORDER BY score DESC"; $result = pager_query($query, 15, 0, $count_query, $arguments); $results = array(); |