From b764f60728be1d4e026f9d7ae618ab47e23322f8 Mon Sep 17 00:00:00 2001 From: donncha Date: Thu, 31 Aug 2006 14:55:29 +0000 Subject: WP Merge to rev #4147 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@729 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-includes/feed.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'wp-includes/feed.php') diff --git a/wp-includes/feed.php b/wp-includes/feed.php index c406b7b..fd8b8a0 100644 --- a/wp-includes/feed.php +++ b/wp-includes/feed.php @@ -87,20 +87,20 @@ function comments_rss_link($link_text = 'Comments RSS', $commentsrssfilename = ' function comments_rss($commentsrssfilename = '') { global $id; - if ('' != get_settings('permalink_structure')) + if ('' != get_option('permalink_structure')) $url = trailingslashit( get_permalink() ) . 'feed/'; else - $url = get_settings('home') . "/$commentsrssfilename?feed=rss2&p=$id"; + $url = get_option('home') . "/$commentsrssfilename?feed=rss2&p=$id"; return apply_filters('post_comments_feed_link', $url); } function get_author_rss_link($echo = false, $author_id, $author_nicename) { $auth_ID = $author_id; - $permalink_structure = get_settings('permalink_structure'); + $permalink_structure = get_option('permalink_structure'); if ('' == $permalink_structure) { - $link = get_settings('home') . '?feed=rss2&author=' . $author_id; + $link = get_option('home') . '?feed=rss2&author=' . $author_id; } else { $link = get_author_link(0, $author_id, $author_nicename); $link = $link . "feed/"; @@ -113,10 +113,10 @@ function get_author_rss_link($echo = false, $author_id, $author_nicename) { } function get_category_rss_link($echo = false, $cat_ID, $category_nicename) { - $permalink_structure = get_settings('permalink_structure'); + $permalink_structure = get_option('permalink_structure'); if ('' == $permalink_structure) { - $link = get_settings('home') . '?feed=rss2&cat=' . $cat_ID; + $link = get_option('home') . '?feed=rss2&cat=' . $cat_ID; } else { $link = get_category_link($cat_ID); $link = $link . "feed/"; @@ -161,4 +161,4 @@ function rss_enclosure() { } } -?> \ No newline at end of file +?> -- cgit