Wordpress 2.3.2

[autoinstalls/wordpress.git] / wp-feed.php

diff --git a/wp-feed.php b/wp-feed.php
index 930507716ecb6ffc6b92d9c329d1a760bcf1a151..260ddd4751e655bbb822d2002e1b6ed5cfd71618 100644 (file)
--- a/wp-feed.php
+++ b/wp-feed.php
@@ -1,37 +1,10 @@
 <?php
 
 if (empty($doing_rss)) {
-    $doing_rss = 1;
-    require(dirname(__FILE__) . '/wp-blog-header.php');
+       $doing_rss = 1;
+       require(dirname(__FILE__) . '/wp-blog-header.php');
 }
 
-// Remove the pad, if present.
-$feed = preg_replace('/^_+/', '', $feed);
-
-if ($feed == '' || $feed == 'feed') {
-    $feed = 'rss2';
-}
-
-if ( is_single() || ($withcomments == 1) ) {
-    require(ABSPATH . 'wp-commentsrss2.php');
-} else {
-    switch ($feed) {
-    case 'atom':
-        require(ABSPATH . 'wp-atom.php');
-        break;
-    case 'rdf':
-        require(ABSPATH . 'wp-rdf.php');
-        break;
-    case 'rss':
-        require(ABSPATH . 'wp-rss.php');
-        break;
-    case 'rss2':
-        require(ABSPATH . 'wp-rss2.php');
-        break;
-    case 'comments-rss2':
-        require(ABSPATH . 'wp-commentsrss2.php');
-        break;
-    }
-}
+do_feed();
 
 ?>