Changeset 2384

Timestamp:

02/26/2005 06:12:16 AM (19 years ago)

Author:

ryan

Message:

Use index.php for feed links instead of wp-*.php ​http://mosquito.wordpress.org/view.php?id=915

Location:

trunk

Files:

• wp-feed.php (modified) (1 diff)
• wp-includes/feed-functions.php (modified) (4 diffs)
• wp-includes/template-functions-links.php (modified) (1 diff)

trunk/wp-feed.php

@@ -29 +29 @@
         require('wp-rss2.php');
         break;
+    case 'comments-rss2':
+        require('wp-commentsrss2.php');
+        break;
     }
 }

trunk/wp-includes/feed-functions.php

@@ -74 +74 @@
 }
 
-function comments_rss_link($link_text = 'Comments RSS', $commentsrssfilename = 'wp-commentsrss2.php') {
+function comments_rss_link($link_text = 'Comments RSS', $commentsrssfilename = '') {
     $url = comments_rss($commentsrssfilename);
     echo "<a href='$url'>$link_text</a>";
 }
 
-function comments_rss($commentsrssfilename = 'wp-commentsrss2.php') {
+function comments_rss($commentsrssfilename = '') {
     global $id;
 
@@ -85 +85 @@
         $url = trailingslashit( get_permalink() ) . 'feed/';
     else
-        $url = get_settings('siteurl') . "/$commentsrssfilename?p=$id";
+        $url = get_settings('home') . "/$commentsrssfilename?feed=rss2&amp;p=$id";
 
-    return $url;
+    return apply_filters('post_comments_feed_link', $url);
 }
 
@@ -95 +95 @@
 
        if ('' == $permalink_structure) {
-           $file = get_settings('siteurl') . '/wp-rss2.php';
-           $link = $file . '?author=' . $author_id;
+                 $link = get_settings('home') . '?feed=rss2&amp;author=' . $author_id;
        } else {
-           $link = get_author_link(0, $author_id, $author_nicename);
-           $link = $link . "feed/";
+                 $link = get_author_link(0, $author_id, $author_nicename);
+                 $link = $link . "feed/";
        }
+             
+             $link = apply_filters('author_feed_link', $link);
 
        if ($echo) echo $link;
@@ -111 +112 @@
 
        if ('' == $permalink_structure) {
-               $file = get_settings('siteurl') . '/wp-rss2.php';
-        $link = $file . '?cat=' . $category_id;
+                 $link = get_settings('home') . '?feed=rss2&amp;cat=' . $category_id;
        } else {
-        $link = get_category_link($category_id);
-               $link = $link . "feed/";
+                 $link = get_category_link($category_id);
+                 $link = $link . "feed/";
        }
+
+             $link = apply_filters('category_feed_link', $link);
 
        if ($echo) echo $link;

trunk/wp-includes/template-functions-links.php

@@ -169 +169 @@
     } else {
         if ( false !== strpos($feed, 'comments_') )
-            $feed = str_replace('comments_', 'comments', $feed);
-
-        $output = get_settings('siteurl') . "/wp-{$feed}.php";
+            $feed = str_replace('comments_', 'comments-', $feed);
+
+        $output = get_settings('home') . "/?feed={$feed}";
     }