Ticket #5802: make_rss2_default.diff

wp-includes/default-filters.php

@@ -166 +166 @@
 if(!defined('DOING_CRON'))
         add_action('init', 'wp_cron');
 add_action('do_feed_rdf', 'do_feed_rdf', 10, 1);
+add_action('do_feed_rss092', 'do_feed_rss092', 10, 1);
 add_action('do_feed_rss', 'do_feed_rss', 10, 1);
 add_action('do_feed_rss2', 'do_feed_rss2', 10, 1);
 add_action('do_feed_atom', 'do_feed_atom', 10, 1);

wp-includes/rewrite.php

@@ -239 +239 @@
                                         's='
                                         );
 
-        var $feeds = array ( 'feed', 'rdf', 'rss', 'rss2', 'atom' );
+        var $feeds = array ( 'feed', 'rdf', 'rss', 'rss2', 'rss092', 'atom' );
 
         function using_permalinks() {
                 if (empty($this->permalink_structure))
@@ -552 +552 @@
 
         //the main WP_Rewrite function. generate the rules from permalink structure
         function generate_rewrite_rules($permalink_structure, $ep_mask = EP_NONE, $paged = true, $feed = true, $forcomments = false, $walk_dirs = true, $endpoints = true) {
-                //build a regex to match the feed section of URLs, something like (feed|atom|rss|rss2)/?
+                //build a regex to match the feed section of URLs, something like (feed|atom|rss|rss2|rss092)/?
                 $feedregex2 = '';
                 foreach ($this->feeds as $feed_name) {
                         $feedregex2 .= $feed_name . '|';
@@ -645 +645 @@
                         $pagematch = $match . $pageregex;
                         $pagequery = $index . '?' . $query . '&paged=' . $this->preg_index($num_toks + 1);
 
-                        //create query for /feed/(feed|atom|rss|rss2|rdf)
+                        //create query for /feed/(feed|atom|rss|rss2|rss092|rdf)
                         $feedmatch = $match . $feedregex;
                         $feedquery = $feedindex . '?' . $query . '&feed=' . $this->preg_index($num_toks + 1);
 
-                        //create query for /(feed|atom|rss|rss2|rdf) (see comment near creation of $feedregex)
+                        //create query for /(feed|atom|rss|rss2|rss092|rdf) (see comment near creation of $feedregex)
                         $feedmatch2 = $match . $feedregex2;
                         $feedquery2 = $feedindex . '?' . $query . '&feed=' . $this->preg_index($num_toks + 1);
 
@@ -788 +788 @@
                 //Default Feed rules - These are require to allow for the direct access files to work with permalink structure starting with %category%
                 $default_feeds = array( 'wp-atom.php$'  =>      $this->index .'?feed=atom',
                                                                 'wp-rdf.php$'   =>      $this->index .'?feed=rdf',
-                                                                'wp-rss.php$'   =>      $this->index .'?feed=rss',
+                                                                'wp-rss.php$'   =>      $this->index .'?feed=rss092',
                                                                 'wp-rss2.php$'  =>      $this->index .'?feed=rss2',
                                                                 'wp-feed.php$'  =>      $this->index .'?feed=feed',
                                                                 'wp-commentsrss2.php$'  =>      $this->index . '?feed=rss2&withcomments=1');

wp-includes/general-template.php

@@ -91 +91 @@
                 case 'rss_url':
                         $output = get_feed_link('rss');
                         break;
+                case 'rss092_url':
+                        $output = get_feed_link('rss092');
+                        break;
                 case 'rss2_url':
                         $output = get_feed_link('rss2');
                         break;

wp-includes/feed.php

@@ -110 +110 @@
         echo $comment_text;
 }
 
-function get_the_category_rss($type = 'rss') {
+function get_the_category_rss($type = '') {
+        $type = ( empty( $type ) ) ? get_default_feed() : $type;
         $categories = get_the_category();
         $tags = get_the_tags();
         $the_list = '';
@@ -142 +143 @@
         return apply_filters('the_category_rss', $the_list, $type);
 }
 
-function the_category_rss($type = 'rss') {
+function the_category_rss($type = '') {
         echo get_the_category_rss($type);
 }
 

wp-rss.php

@@ -2 +2 @@
 
 if (empty($wp)) {
         require_once('./wp-config.php');
-        wp('feed=rss');
+        wp('feed=rss092');
 }
 
 require (ABSPATH . WPINC . '/feed-rss.php');