Changeset 19364

Timestamp:

11/20/2011 06:32:42 PM (13 years ago)

Author:

nacin

Message:

Restore RDF feed. fixes #4967.

Location:

trunk/wp-includes

Files:

• canonical.php (modified) (3 diffs)
• feed.php (modified) (1 diff)
• version.php (modified) (1 diff)

trunk/wp-includes/canonical.php

@@ -219 +219 @@
                 if ( get_query_var( 'withcomments' ) )
                     $addl_path .= 'comments/';
-                if ( ( in_array( get_default_feed(), array( 'rss', 'rdf' ) ) && 'feed' == get_query_var('feed') ) || in_array( get_query_var('feed'), array( 'rss', 'rdf' ) ) )
+                if ( ( 'rss' == get_default_feed() && 'feed' == get_query_var('feed') ) || 'rss' == get_query_var('feed') )
                     $addl_path .= user_trailingslashit( 'feed/' . ( ( get_default_feed() == 'rss2' ) ? '' : 'rss2' ), 'feed' );
                 else
@@ -229 +229 @@
                     'wp-commentsrss2.php' => 'comments_rss2',
                     'wp-feed.php'         => get_default_feed(),
-                    'wp-rdf.php'          => 'rss2',
+                    'wp-rdf.php'          => 'rdf',
                     'wp-rss.php'          => 'rss2',
                     'wp-rss2.php'         => 'rss2',
@@ -315 +315 @@
 
         // Redirect obsolete feeds
-        $redirect['query'] = preg_replace( '#(^|&)feed=(rss|rdf)(&|$)#', '$1feed=rss2$3', $redirect['query'] );
+        $redirect['query'] = preg_replace( '#(^|&)feed=rss(&|$)#', '$1feed=rss2$3', $redirect['query'] );
 
         // Remove redundant leading ampersands

trunk/wp-includes/feed.php

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

trunk/wp-includes/version.php

@@ -12 +12 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 19061;
+$wp_db_version = 19364;
 
 /**