From b863cf90d17561883b9ecb3a4eca88f9d01c7cce Mon Sep 17 00:00:00 2001
From: rboren <rboren@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 2 Jun 2004 07:14:03 +0000
Subject: [PATCH] Make /feed/ and /comments/feed work with path info. 
 Introduce get_feed_link().

git-svn-id: http://svn.automattic.com/wordpress/trunk@1382 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/functions.php                  | 11 +++--
 wp-includes/template-functions-general.php | 35 ++-----------
 wp-includes/template-functions-links.php   | 57 ++++++++++++++++++++++
 3 files changed, 70 insertions(+), 33 deletions(-)

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index ec3ea77f98..b6e593093f 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1303,6 +1303,11 @@ function rewrite_rules($matches = '', $permalink_structure = '') {
     $feedregex = '(feed|rdf|rss|rss2|atom)/?$';
     $pageregex = 'page/?([0-9]{1,})/?$';
     $front = substr($permalink_structure, 0, strpos($permalink_structure, '%'));    
+    $index = get_settings('blogfilename');
+    $prefix = '';
+    if (preg_match('#^/*' . $index . '#', $front)) {
+        $prefix = $index . '/';
+    }
 
     // If the permalink does not have year, month, and day, we need to create a
     // separate archive rule.
@@ -1314,15 +1319,15 @@ function rewrite_rules($matches = '', $permalink_structure = '') {
     }
 
     // Site feed
-    $sitefeedmatch = 'feed/?([_0-9a-z-]+)?/?$';
+    $sitefeedmatch = $prefix . 'feed/?([_0-9a-z-]+)?/?$';
     $sitefeedquery = 'index.php?feed=_' . preg_index(1, $matches);
 
     // Site comment feed
-    $sitecommentfeedmatch = 'comments/feed/?([_0-9a-z-]+)?/?$';
+    $sitecommentfeedmatch = $prefix . 'comments/feed/?([_0-9a-z-]+)?/?$';
     $sitecommentfeedquery = 'index.php?feed=_' . preg_index(1, $matches) . '&withcomments=1';
 
     // Site page
-    $sitepagematch = $pageregex;
+    $sitepagematch = $prefix . $pageregex;
     $sitepagequery = 'index.php?paged=' . preg_index(1, $matches);
 
     $site_rewrite = array(
diff --git a/wp-includes/template-functions-general.php b/wp-includes/template-functions-general.php
index 40beadbc88..cbf0e753b1 100644
--- a/wp-includes/template-functions-general.php
+++ b/wp-includes/template-functions-general.php
@@ -20,16 +20,6 @@ function bloginfo_unicode($show='') {
 
 function get_bloginfo($show='') {
 
-    $do_perma = 0;
-    $feed_url = get_settings('siteurl');
-    $comment_feed_url = get_settings('siteurl');
-
-    if ('' != get_settings('permalink_structure')) {
-        $do_perma = 1;
-        $feed_url = get_settings('home') . '/feed';
-        $comment_feed_url = get_settings('home') . '/comments/feed';
-    }
-
     switch($show) {
         case 'url':
 		case 'siteurl':
@@ -39,34 +29,19 @@ function get_bloginfo($show='') {
             $output = get_settings('blogdescription');
             break;
         case 'rdf_url':
-            $output = get_settings('siteurl') .'/wp-rdf.php';
-            if ($do_perma) {
-                $output = $feed_url . '/rdf/';
-            }
+            $output = get_feed_link('rdf');
             break;
         case 'rss_url':
-            $output = get_settings('siteurl') .'/wp-rss.php';
-            if ($do_perma) {
-                $output = $feed_url . '/rss/';
-            }
+            $output = get_feed_link('rss');
             break;
         case 'rss2_url':
-            $output = get_settings('siteurl') .'/wp-rss2.php';
-            if ($do_perma) {
-                $output = $feed_url . '/rss2/';
-            }
+            $output = get_feed_link('rss2');
             break;
         case 'atom_url':
-            $output = get_settings('siteurl') .'/wp-atom.php';
-            if ($do_perma) {
-                $output = $feed_url . '/atom/';
-            }
+            $output = get_feed_link('atom');
             break;        
         case 'comments_rss2_url':
-            $output = get_settings('siteurl') .'/wp-commentsrss2.php';
-            if ($do_perma) {
-                $output = $comment_feed_url . '/rss2/';
-            }
+            $output = get_feed_link('comments_rss2');
             break;
         case 'pingback_url':
             $output = get_settings('siteurl') .'/xmlrpc.php';
diff --git a/wp-includes/template-functions-links.php b/wp-includes/template-functions-links.php
index 1e223213be..71848fac27 100644
--- a/wp-includes/template-functions-links.php
+++ b/wp-includes/template-functions-links.php
@@ -134,6 +134,63 @@ function get_day_link($year, $month, $day) {
     }
 }
 
+function get_feed_link($feed='rss2') {
+    $do_perma = 0;
+    $feed_url = get_settings('siteurl');
+    $comment_feed_url = $feed_url;
+
+    $permalink = get_settings('permalink_structure');
+    if ('' != $permalink) {
+        $do_perma = 1;
+        $feed_url = get_settings('home');
+        $index = get_settings('blogfilename');
+        $prefix = '';
+        if (preg_match('#^/*' . $index . '#', $permalink)) {
+            $feed_url .= '/' . $index;
+        }
+
+        $comment_feed_url = $feed_url;
+        $feed_url .= '/feed';
+        $comment_feed_url .= '/comments/feed';
+    }
+
+    switch($feed) {
+        case 'rdf':
+            $output = $feed_url .'/wp-rdf.php';
+            if ($do_perma) {
+                $output = $feed_url . '/rdf/';
+            }
+            break;
+        case 'rss':
+            $output = $feed_url . '/wp-rss.php';
+            if ($do_perma) {
+                $output = $feed_url . '/rss/';
+            }
+            break;
+        case 'atom':
+            $output = $feed_url .'/wp-atom.php';
+            if ($do_perma) {
+                $output = $feed_url . '/atom/';
+            }
+            break;        
+        case 'comments_rss2':
+            $output = $feed_url .'/wp-commentsrss2.php';
+            if ($do_perma) {
+                $output = $comment_feed_url . '/rss2/';
+            }
+            break;
+        case 'rss2':
+        default:
+            $output = $feed_url .'/wp-rss2.php';
+            if ($do_perma) {
+                $output = $feed_url . '/rss2/';
+            }
+            break;
+    }
+
+    return $output;
+}
+
 function edit_post_link($link = 'Edit This', $before = '', $after = '') {
     global $user_level, $post;