Make WordPress Core

Ticket #4595: 4595-feed-format.diff

File 4595-feed-format.diff, 2.0 KB (added by lloydbudd, 16 years ago)
  • wp-includes/functions.php

     
    861861        $feed = preg_replace( '/^_+/', '', $feed );
    862862
    863863        if ( $feed == '' || $feed == 'feed' )
    864                 $feed = 'rss2';
     864                $feed = get_option('feed_format'); // default is rss2
    865865
    866866        $hook = 'do_feed_' . $feed;
    867867        do_action( $hook, $wp_query->is_comment_feed );
     
    14841484        return abs( intval( $maybeint ) );
    14851485}
    14861486
    1487 ?>
    1488  No newline at end of file
     1487?>
  • wp-admin/includes/schema.php

     
    234234        // 2.2
    235235        add_option('tag_base');
    236236
     237        // 2.4
     238        add_option('feed_format', 'rss2');
     239
    237240        // Delete unused options
    238241        $unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog', '_wpnonce', '_wp_http_referer', 'Update', 'action', 'rich_editing');
    239242        foreach ($unusedoptions as $option) :