Changeset 18537

Timestamp:

08/11/2011 11:30:59 PM (13 years ago)

Author:

markjaquith

Message:

Deprecate RSS 0.92 and RDF feeds, and 301 them to the default feed. props johnpbloch. fixes #4967

Location:

trunk/wp-includes

Files:

• canonical.php (modified) (2 diffs)
• feed.php (modified) (1 diff)

trunk/wp-includes/canonical.php

@@ -219 +219 @@
                 if ( get_query_var( 'withcomments' ) )
                     $addl_path .= 'comments/';
-                $addl_path .= user_trailingslashit( 'feed/' . ( ( get_default_feed() ==  get_query_var('feed') || 'feed' == get_query_var('feed') ) ? '' : get_query_var('feed') ), 'feed' );
+                if( (in_array( get_default_feed(), array( 'rss', 'rdf' ) ) && 'feed' == get_query_var('feed')) || in_array( get_query_var('feed'), array( 'rss', 'rdf' ) ) )
+                    $addl_path .= user_trailingslashit( 'feed/' . ( ( get_default_feed() == 'rss2' ) ? '' : 'rss2' ), 'feed' );
+                else
+                    $addl_path .= user_trailingslashit( 'feed/' . ( ( get_default_feed() ==  get_query_var('feed') || 'feed' == get_query_var('feed') ) ? '' : get_query_var('feed') ), 'feed' );
                 $redirect['query'] = remove_query_arg( 'feed', $redirect['query'] );
             }
@@ -296 +299 @@
         $redirect['query'] = trim(preg_replace( '#(^|&)(p|page_id|cat|tag)=?(&|$)#', '&', $redirect['query']), '&');
 
+        // Redirect obsolete feeds
+        $redirect['query'] = preg_replace( '#(^|&)feed=(rss|rdf)(&|$)#', '$1feed=rss2$3', $redirect['query'] );
+
         // Remove redundant leading ampersands
         $redirect['query'] = preg_replace( '#^\??&*?#', '', $redirect['query'] );

trunk/wp-includes/feed.php

@@ -64 +64 @@
  */
 function get_default_feed() {
-    return apply_filters('default_feed', 'rss2');
+    $default_feed = apply_filters('default_feed', 'rss2');
+    return in_array( $default_feed, array( 'rss', 'rdf' ) ) ? 'rss2' : $default_feed;
 }