summaryrefslogtreecommitdiff
path: root/modules/blog.module
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2005-09-07 20:17:18 +0000
committerDries Buytaert <dries@buytaert.net>2005-09-07 20:17:18 +0000
commit3c570c93a70fe433ef87b916a383898aaf789036 (patch)
tree5da81f69951094cbc81f1527cf40a56a2ca8612c /modules/blog.module
parent7f73c2bfb2ad78e8867ba25c1fb1e6848418f6da (diff)
downloadbrdo-3c570c93a70fe433ef87b916a383898aaf789036.tar.gz
brdo-3c570c93a70fe433ef87b916a383898aaf789036.tar.bz2
- Patch #7582 by Gerhard: updated the blog.module to use the new node revisions.
Diffstat (limited to 'modules/blog.module')
-rw-r--r--modules/blog.module4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/blog.module b/modules/blog.module
index d60c1fcaa..6ce8ffd32 100644
--- a/modules/blog.module
+++ b/modules/blog.module
@@ -77,7 +77,7 @@ function blog_feed_user($uid = 0) {
$account = $user;
}
- $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.title, n.teaser, n.created, u.name, u.uid FROM {node} n 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, 15);
+ $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, 15);
$channel['title'] = $account->name ."'s blog";
$channel['link'] = url("blog/$uid", NULL, NULL, TRUE);
$channel['description'] = $term->description;
@@ -88,7 +88,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, n.teaser, n.created, u.name, u.uid FROM {node} n INNER JOIN {users} u ON n.uid = u.uid WHERE n.type = 'blog' AND n.status = 1 ORDER BY n.created DESC"), 0, 15);
+ $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, 15);
$channel['title'] = variable_get('site_name', 'drupal') .' blogs';
$channel['link'] = url('blog', NULL, NULL, TRUE);
$channel['description'] = $term->description;