Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Restore RDF feed. fixes #4967. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19364 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2011-11-20 18:32:42 +00:00
parent eeedb253a7
commit 15ff65a694
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/canonical.php
View File

@ -218,7 +218,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
$addl_path = !empty( $addl_path ) ? trailingslashit($addl_path) : '';
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
$addl_path .= user_trailingslashit( 'feed/' . ( ( get_default_feed() == get_query_var('feed') || 'feed' == get_query_var('feed') ) ? '' : get_query_var('feed') ), 'feed' );
@ -228,7 +228,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
'wp-atom.php' => 'atom',
'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',
);
@ -314,7 +314,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
$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'] );
$redirect['query'] = preg_replace( '#(^|&)feed=rss(&|$)#', '$1feed=rss2$3', $redirect['query'] );
// Remove redundant leading ampersands
$redirect['query'] = preg_replace( '#^\??&*?#', '', $redirect['query'] );

2
wp-includes/feed.php
View File

@ -64,7 +64,7 @@ function bloginfo_rss($show = '') {
*/
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;
}
/**

2
wp-includes/version.php
View File

@ -11,7 +11,7 @@ $wp_version = '3.3-beta3-19254';
*
* @global int $wp_db_version
*/
$wp_db_version = 19061;
$wp_db_version = 19364;
/**
* Holds the TinyMCE version