summaryrefslogtreecommitdiffstats
path: root/wp-includes/feed.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-02-15 13:19:12 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-02-15 13:19:12 +0000
commit8752f7651d737da0dbe86065e708347a58b40d61 (patch)
treeac80c1eb849760d123d729ffb33fb8a9dc1742db /wp-includes/feed.php
parent982f28611561556403f1c1004ad41f3253205e0e (diff)
WP Merge to rev 4887
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@888 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/feed.php')
-rw-r--r--wp-includes/feed.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/wp-includes/feed.php b/wp-includes/feed.php
index 6c57fc5..04f54d9 100644
--- a/wp-includes/feed.php
+++ b/wp-includes/feed.php
@@ -99,7 +99,7 @@ function comments_rss($commentsrssfilename = '') {
global $id;
if ( '' != get_option('permalink_structure') )
- $url = trailingslashit( get_permalink() ) . 'feed/';
+ $url = trailingslashit( get_permalink() ) . user_trailingslashit('feed');
else
$url = get_option('home') . "/$commentsrssfilename?feed=rss2&amp;p=$id";
@@ -115,7 +115,7 @@ function get_author_rss_link($echo = false, $author_id, $author_nicename) {
$link = get_option('home') . '?feed=rss2&amp;author=' . $author_id;
} else {
$link = get_author_posts_url($author_id, $author_nicename);
- $link = $link . "feed/";
+ $link = $link . user_trailingslashit('feed');
}
$link = apply_filters('author_feed_link', $link);
@@ -133,7 +133,7 @@ function get_category_rss_link($echo = false, $cat_ID, $category_nicename) {
$link = get_option('home') . '?feed=rss2&amp;cat=' . $cat_ID;
} else {
$link = get_category_link($cat_ID);
- $link = $link . "feed/";
+ $link = $link . user_trailingslashit('feed/');
}
$link = apply_filters('category_feed_link', $link);