WordPress.org
Get WordPress

Make WordPress Core

Changeset 19784


Ignore:
Timestamp:
01/29/2012 07:56:33 PM (13 years ago)
Author:
nacin
Message:

Use the site's locale for the feed language. Provides the same result as language_attributes(). Removes the rss_language option. fixes #13440. see #5517.

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-admin/includes/export.php

    r19233 r19784  
    332332    <description><?php bloginfo_rss( 'description' ); ?></description>
    333333    <pubDate><?php echo date( 'D, d M Y H:i:s +0000' ); ?></pubDate>
    334     <language><?php echo get_option( 'rss_language' ); ?></language>
     334    <language><?php bloginfo_rss( 'language' ); ?></language>
    335335    <wp:wxr_version><?php echo WXR_VERSION; ?></wp:wxr_version>
    336336    <wp:base_site_url><?php echo wxr_site_url(); ?></wp:base_site_url>

  • trunk/wp-admin/includes/schema.php

    r19780 r19784  
    410410    'blacklist_keys' => '',
    411411    'comment_registration' => 0,
    412     'rss_language' => 'en',
    413412    'html_type' => 'text/html',
    414413
    … …  
    525524
    526525    // Delete unused options
    527     $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', 'autosave_interval', 'deactivated_plugins', 'can_compress_scripts', 'page_uris', 'update_core', 'update_plugins', 'update_themes', 'doing_cron', 'random_seed', 'rss_excerpt_length', 'secret', 'use_linksupdate', 'default_comment_status_page', 'wporg_popular_tags', 'what_to_show');
     526    $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', 'autosave_interval', 'deactivated_plugins', 'can_compress_scripts', 'page_uris', 'update_core', 'update_plugins', 'update_themes', 'doing_cron', 'random_seed', 'rss_excerpt_length', 'secret', 'use_linksupdate', 'default_comment_status_page', 'wporg_popular_tags', 'what_to_show', 'rss_language');
    528527    foreach ( $unusedoptions as $option )
    529528        delete_option($option);

  • trunk/wp-app.php

    r19712 r19784  
    10781078        $last_page = ((int)$last_page == 1 || (int)$last_page == 0) ? null : (int) $last_page;
    10791079        $self_page = $page > 1 ? $page : null;
    1080 ?><feed xmlns="<?php echo $this->ATOM_NS ?>" xmlns:app="<?php echo $this->ATOMPUB_NS ?>" xml:lang="<?php echo get_option('rss_language'); ?>" <?php do_action('app_ns'); ?> >
     1080?><feed xmlns="<?php echo $this->ATOM_NS ?>" xmlns:app="<?php echo $this->ATOMPUB_NS ?>" xml:lang="<?php bloginfo_rss( 'language' ); ?>" <?php do_action('app_ns'); ?> >
    10811081<id><?php $this->the_entries_url() ?></id>
    10821082<updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT'), false); ?></updated>
    … …  
    11511151    function echo_entry() { ?>
    11521152<entry xmlns="<?php echo $this->ATOM_NS ?>"
    1153        xmlns:app="<?php echo $this->ATOMPUB_NS ?>" xml:lang="<?php echo get_option('rss_language'); ?>">
     1153       xmlns:app="<?php echo $this->ATOMPUB_NS ?>" xml:lang="<?php bloginfo_rss( 'language' ); ?>">
    11541154    <id><?php the_guid( $GLOBALS['post']->ID ); ?></id>
    11551155<?php list($content_type, $content) = prep_atom_text_construct(get_the_title()); ?>

  • trunk/wp-includes/feed-atom-comments.php

    r18716 r19784  
    1111<feed
    1212    xmlns="http://www.w3.org/2005/Atom"
    13     xml:lang="<?php echo get_option('rss_language'); ?>"
     13    xml:lang="<?php bloginfo_rss( 'language' ); ?>"
    1414    xmlns:thr="http://purl.org/syndication/thread/1.0"
    1515    <?php do_action('atom_ns'); do_action('atom_comments_ns'); ?>

  • trunk/wp-includes/feed-atom.php

    r17641 r19784  
    1313  xmlns="http://www.w3.org/2005/Atom"
    1414  xmlns:thr="http://purl.org/syndication/thread/1.0"
    15   xml:lang="<?php echo get_option('rss_language'); ?>"
     15  xml:lang="<?php bloginfo_rss( 'language' ); ?>"
    1616  xml:base="<?php bloginfo_rss('url') ?>/wp-atom.php"
    1717  <?php do_action('atom_ns'); ?>

  • trunk/wp-includes/feed-rss.php

    r13113 r19784  
    1717    <lastBuildDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_lastpostmodified('GMT'), false); ?></lastBuildDate>
    1818    <docs>http://backend.userland.com/rss092</docs>
    19     <language><?php echo get_option('rss_language'); ?></language>
     19    <language><?php bloginfo_rss( 'language' ); ?></language>
    2020    <?php do_action('rss_head'); ?>
    2121

  • trunk/wp-includes/feed-rss2.php

    r15984 r19784  
    2727    <description><?php bloginfo_rss("description") ?></description>
    2828    <lastBuildDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_lastpostmodified('GMT'), false); ?></lastBuildDate>
    29     <language><?php echo get_option('rss_language'); ?></language>
     29    <language><?php bloginfo_rss( 'language' ); ?></language>
    3030    <sy:updatePeriod><?php echo apply_filters( 'rss_update_period', 'hourly' ); ?></sy:updatePeriod>
    3131    <sy:updateFrequency><?php echo apply_filters( 'rss_update_frequency', '1' ); ?></sy:updateFrequency>

  • trunk/wp-includes/version.php

    r19719 r19784  
    1212 * @global int $wp_db_version
    1313 */
    14 $wp_db_version = 19470;
     14$wp_db_version = 19784;
    1515
    1616/**
Note: See TracChangeset for help on using the changeset viewer.