summaryrefslogtreecommitdiff
path: root/modules/blog
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2006-10-30 11:21:33 +0000
committerDries Buytaert <dries@buytaert.net>2006-10-30 11:21:33 +0000
commitdef059a26925ce1924d59d353aaeca39176b0dea (patch)
treeff8cbb35350dc3077149c9eca3750517bbe95169 /modules/blog
parent1e27bbd41fbce52fc9a82e61516e6846f856c664 (diff)
downloadbrdo-def059a26925ce1924d59d353aaeca39176b0dea.tar.gz
brdo-def059a26925ce1924d59d353aaeca39176b0dea.tar.bz2
- Patch #59832 by markus and chx: simplified SQL query.
Diffstat (limited to 'modules/blog')
-rw-r--r--modules/blog/blog.module4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/blog/blog.module b/modules/blog/blog.module
index bc1da62c8..95e5af835 100644
--- a/modules/blog/blog.module
+++ b/modules/blog/blog.module
@@ -92,7 +92,7 @@ function blog_feed_user($uid = 0) {
$account = $user;
}
- $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.title, r.teaser, n.created, u.name, u.uid FROM {node} n INNER JOIN {node_revisions} r ON n.vid = r.vid INNER JOIN {users} u ON n.uid = u.uid WHERE n.type = 'blog' AND u.uid = %d AND n.status = 1 ORDER BY n.created DESC"), $uid, 0, variable_get('feed_default_items', 10));
+ $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.created FROM {node} n WHERE n.type = 'blog' AND n.uid = %d AND n.status = 1 ORDER BY n.created DESC"), $uid, 0, variable_get('feed_default_items', 10));
$channel['title'] = $account->name ."'s blog";
$channel['link'] = url("blog/$uid", NULL, NULL, TRUE);
$channel['description'] = $term->description;
@@ -103,7 +103,7 @@ function blog_feed_user($uid = 0) {
* Displays an RSS feed containing recent blog entries of all users.
*/
function blog_feed_last() {
- $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.title, r.teaser, n.created, u.name, u.uid FROM {node} n INNER JOIN {node_revisions} r ON n.vid = r.vid INNER JOIN {users} u ON n.uid = u.uid WHERE n.type = 'blog' AND n.status = 1 ORDER BY n.created DESC"), 0, variable_get('feed_default_items', 10));
+ $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.created FROM {node} n WHERE n.type = 'blog' AND n.status = 1 ORDER BY n.created DESC"), 0, variable_get('feed_default_items', 10));
$channel['title'] = variable_get('site_name', 'Drupal') .' blogs';
$channel['link'] = url('blog', NULL, NULL, TRUE);
$channel['description'] = $term->description;