WordPress.org

Make WordPress Core

Changeset 19364


Ignore:
Timestamp:
11/20/11 18:32:42 (3 years ago)
Author:
nacin
Message:

Restore RDF feed. fixes #4967.

Location:
trunk/wp-includes
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/canonical.php

    r18884 r19364  
    219219                if ( get_query_var( 'withcomments' ) ) 
    220220                    $addl_path .= 'comments/'; 
    221                 if ( ( in_array( get_default_feed(), array( 'rss', 'rdf' ) ) && 'feed' == get_query_var('feed') ) || in_array( get_query_var('feed'), array( 'rss', 'rdf' ) ) ) 
     221                if ( ( 'rss' == get_default_feed() && 'feed' == get_query_var('feed') ) || 'rss' == get_query_var('feed') ) 
    222222                    $addl_path .= user_trailingslashit( 'feed/' . ( ( get_default_feed() == 'rss2' ) ? '' : 'rss2' ), 'feed' ); 
    223223                else 
     
    229229                    'wp-commentsrss2.php' => 'comments_rss2', 
    230230                    'wp-feed.php'         => get_default_feed(), 
    231                     'wp-rdf.php'          => 'rss2', 
     231                    'wp-rdf.php'          => 'rdf', 
    232232                    'wp-rss.php'          => 'rss2', 
    233233                    'wp-rss2.php'         => 'rss2', 
     
    315315 
    316316        // Redirect obsolete feeds 
    317         $redirect['query'] = preg_replace( '#(^|&)feed=(rss|rdf)(&|$)#', '$1feed=rss2$3', $redirect['query'] ); 
     317        $redirect['query'] = preg_replace( '#(^|&)feed=rss(&|$)#', '$1feed=rss2$3', $redirect['query'] ); 
    318318 
    319319        // Remove redundant leading ampersands 
  • trunk/wp-includes/feed.php

    r18537 r19364  
    6565function get_default_feed() { 
    6666    $default_feed = apply_filters('default_feed', 'rss2'); 
    67     return in_array( $default_feed, array( 'rss', 'rdf' ) ) ? 'rss2' : $default_feed; 
     67    return 'rss' == $default_feed ? 'rss2' : $default_feed; 
    6868} 
    6969 
  • trunk/wp-includes/version.php

    r19278 r19364  
    1212 * @global int $wp_db_version 
    1313 */ 
    14 $wp_db_version = 19061; 
     14$wp_db_version = 19364; 
    1515 
    1616/** 
Note: See TracChangeset for help on using the changeset viewer.