Changeset 4929

Timestamp:

02/23/2007 08:31:07 AM (18 years ago)

Author:

ryan

Message:

Add get_post_comments_feed_link() and have popup comments templates use it.

Location:

trunk

Files:

• wp-content/themes/classic/comments-popup.php (modified) (1 diff)
• wp-content/themes/default/comments-popup.php (modified) (1 diff)
• wp-includes/feed.php (modified) (1 diff)
• wp-includes/link-template.php (modified) (1 diff)

trunk/wp-content/themes/classic/comments-popup.php

@@ -22 +22 @@
 <h2 id="comments"><?php _e("Comments"); ?></h2>
 
-<p><a href="<?php echo get_option('siteurl'); ?>/wp-commentsrss2.php?p=<?php echo $post->ID; ?>"><?php _e("<abbr title=\"Really Simple Syndication\">RSS</abbr> feed for comments on this post."); ?></a></p>
+<p><a href="<?php echo get_post_comments_feed_link($post->ID); ?>"><?php _e("<abbr title=\"Really Simple Syndication\">RSS</abbr> feed for comments on this post."); ?></a></p>
 
 <?php if ('open' == $post->ping_status) { ?>

trunk/wp-content/themes/default/comments-popup.php

@@ -22 +22 @@
 <h2 id="comments">Comments</h2>
 
-<p><a href="<?php echo get_option('siteurl'); ?>/wp-commentsrss2.php?p=<?php echo $post->ID; ?>"><abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.</a></p>
+<p><a href="<?php echo get_post_comments_feed_link($post->ID); ?>"><abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.</a></p>
 
 <?php if ('open' == $post->ping_status) { ?>

trunk/wp-includes/feed.php

@@ -90 +90 @@
 
 
-function comments_rss_link($link_text = 'Comments RSS', $commentsrssfilename = '') {
-    $url = comments_rss($commentsrssfilename);
+function comments_rss_link($link_text = 'Comments RSS', $commentsrssfilename = 'nolongerused') {
+    $url = get_post_comments_feed_link();;
     echo "<a href='$url'>$link_text</a>";
 }
 
 
-function comments_rss($commentsrssfilename = '') {
-    global $id;
-
-    if ( '' != get_option('permalink_structure') )
-        $url = trailingslashit( get_permalink() ) . user_trailingslashit('feed');
-    else
-        $url = get_option('home') . "/$commentsrssfilename?feed=rss2&amp;p=$id";
-
-    return apply_filters('post_comments_feed_link', $url);
+function comments_rss($commentsrssfilename = 'nolongerused') {
+    return get_post_comments_feed_link();
 }
 

trunk/wp-includes/link-template.php

@@ -248 +248 @@
 }
 
+function get_post_comments_feed_link($post_id = '', $feed = 'rss2') {
+    global $id;
+
+    if ( empty($post_id) )
+        $post_id = $id;
+
+    if ( '' != get_option('permalink_structure') ) {
+        $url = trailingslashit( get_permalink() ) . 'feed';
+        if ( 'rss2' != $feed )
+            $url .= "/$feed";
+        $url = user_trailingslashit($url);
+    } else {
+        $url = get_option('home') . "/?feed=$feed&p=$id";
+    }
+
+    return apply_filters('post_comments_feed_link', $url);  
+}
+
 function edit_post_link($link = 'Edit This', $before = '', $after = '') {
     global $post;