Commit f2c76967 authored by Dries's avatar Dries
Browse files

- Patch 7727 by Benjamin Grant: fixed incorrect <channel> URL in blog feeds.

parent 67675b49
...@@ -106,7 +106,7 @@ function blog_feed_user($uid = 0) { ...@@ -106,7 +106,7 @@ function blog_feed_user($uid = 0) {
$result = db_query_range("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.nid DESC", $uid, 0, 15); $result = db_query_range("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.nid DESC", $uid, 0, 15);
$channel['title'] = $account->name ."'s blog"; $channel['title'] = $account->name ."'s blog";
$channel['link'] = url("blog/view/$uid", NULL, NULL, TRUE); $channel['link'] = url("blog/$uid", NULL, NULL, TRUE);
$channel['description'] = $term->description; $channel['description'] = $term->description;
node_feed($result, $channel); node_feed($result, $channel);
} }
......
...@@ -106,7 +106,7 @@ function blog_feed_user($uid = 0) { ...@@ -106,7 +106,7 @@ function blog_feed_user($uid = 0) {
$result = db_query_range("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.nid DESC", $uid, 0, 15); $result = db_query_range("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.nid DESC", $uid, 0, 15);
$channel['title'] = $account->name ."'s blog"; $channel['title'] = $account->name ."'s blog";
$channel['link'] = url("blog/view/$uid", NULL, NULL, TRUE); $channel['link'] = url("blog/$uid", NULL, NULL, TRUE);
$channel['description'] = $term->description; $channel['description'] = $term->description;
node_feed($result, $channel); node_feed($result, $channel);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment