<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[19784] trunk: Use the site's locale for the feed language.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19784">19784</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-01-29 19:56:33 +0000 (Sun, 29 Jan 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use the site's locale for the feed language. Provides the same result as language_attributes(). Removes the rss_language option. fixes <a href="http://core.trac.wordpress.org/ticket/13440">#13440</a>. see <a href="http://core.trac.wordpress.org/ticket/5517">#5517</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesexportphp">trunk/wp-admin/includes/export.php</a></li>
<li><a href="#trunkwpadminincludesschemaphp">trunk/wp-admin/includes/schema.php</a></li>
<li><a href="#trunkwpappphp">trunk/wp-app.php</a></li>
<li><a href="#trunkwpincludesfeedatomcommentsphp">trunk/wp-includes/feed-atom-comments.php</a></li>
<li><a href="#trunkwpincludesfeedatomphp">trunk/wp-includes/feed-atom.php</a></li>
<li><a href="#trunkwpincludesfeedrssphp">trunk/wp-includes/feed-rss.php</a></li>
<li><a href="#trunkwpincludesfeedrss2php">trunk/wp-includes/feed-rss2.php</a></li>
<li><a href="#trunkwpincludesversionphp">trunk/wp-includes/version.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesexportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/export.php (19783 => 19784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/export.php 2012-01-29 18:47:41 UTC (rev 19783)
+++ trunk/wp-admin/includes/export.php 2012-01-29 19:56:33 UTC (rev 19784)
</span><span class="lines">@@ -331,7 +331,7 @@
</span><span class="cx"> <link><?php bloginfo_rss( 'url' ); ?></link>
</span><span class="cx"> <description><?php bloginfo_rss( 'description' ); ?></description>
</span><span class="cx"> <pubDate><?php echo date( 'D, d M Y H:i:s +0000' ); ?></pubDate>
</span><del>- <language><?php echo get_option( 'rss_language' ); ?></language>
</del><ins>+ <language><?php bloginfo_rss( 'language' ); ?></language>
</ins><span class="cx"> <wp:wxr_version><?php echo WXR_VERSION; ?></wp:wxr_version>
</span><span class="cx"> <wp:base_site_url><?php echo wxr_site_url(); ?></wp:base_site_url>
</span><span class="cx"> <wp:base_blog_url><?php bloginfo_rss( 'url' ); ?></wp:base_blog_url>
</span></span></pre></div>
<a id="trunkwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/schema.php (19783 => 19784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php 2012-01-29 18:47:41 UTC (rev 19783)
+++ trunk/wp-admin/includes/schema.php 2012-01-29 19:56:33 UTC (rev 19784)
</span><span class="lines">@@ -409,7 +409,6 @@
</span><span class="cx"> 'comment_whitelist' => 1,
</span><span class="cx"> 'blacklist_keys' => '',
</span><span class="cx"> 'comment_registration' => 0,
</span><del>- 'rss_language' => 'en',
</del><span class="cx"> 'html_type' => 'text/html',
</span><span class="cx">
</span><span class="cx"> // 1.5.1
</span><span class="lines">@@ -524,7 +523,7 @@
</span><span class="cx"> if ( !__get_option('home') ) update_option('home', $guessurl);
</span><span class="cx">
</span><span class="cx"> // Delete unused options
</span><del>- $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', 'ne
w_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');
</del><ins>+ $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');
</ins><span class="cx"> foreach ( $unusedoptions as $option )
</span><span class="cx"> delete_option($option);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpappphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-app.php (19783 => 19784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-app.php 2012-01-29 18:47:41 UTC (rev 19783)
+++ trunk/wp-app.php 2012-01-29 19:56:33 UTC (rev 19784)
</span><span class="lines">@@ -1077,7 +1077,7 @@
</span><span class="cx"> $prev_page = ($page - 1) < 1 ? null : $page - 1;
</span><span class="cx"> $last_page = ((int)$last_page == 1 || (int)$last_page == 0) ? null : (int) $last_page;
</span><span class="cx"> $self_page = $page > 1 ? $page : null;
</span><del>-?><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'); ?> >
</del><ins>+?><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'); ?> >
</ins><span class="cx"> <id><?php $this->the_entries_url() ?></id>
</span><span class="cx"> <updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT'), false); ?></updated>
</span><span class="cx"> <title type="text"><?php bloginfo_rss('name') ?></title>
</span><span class="lines">@@ -1150,7 +1150,7 @@
</span><span class="cx"> */
</span><span class="cx"> function echo_entry() { ?>
</span><span class="cx"> <entry xmlns="<?php echo $this->ATOM_NS ?>"
</span><del>- xmlns:app="<?php echo $this->ATOMPUB_NS ?>" xml:lang="<?php echo get_option('rss_language'); ?>">
</del><ins>+ xmlns:app="<?php echo $this->ATOMPUB_NS ?>" xml:lang="<?php bloginfo_rss( 'language' ); ?>">
</ins><span class="cx"> <id><?php the_guid( $GLOBALS['post']->ID ); ?></id>
</span><span class="cx"> <?php list($content_type, $content) = prep_atom_text_construct(get_the_title()); ?>
</span><span class="cx"> <title type="<?php echo $content_type ?>"><?php echo $content ?></title>
</span></span></pre></div>
<a id="trunkwpincludesfeedatomcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/feed-atom-comments.php (19783 => 19784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/feed-atom-comments.php 2012-01-29 18:47:41 UTC (rev 19783)
+++ trunk/wp-includes/feed-atom-comments.php 2012-01-29 19:56:33 UTC (rev 19784)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> <feed
</span><span class="cx"> xmlns="http://www.w3.org/2005/Atom"
</span><del>- xml:lang="<?php echo get_option('rss_language'); ?>"
</del><ins>+ xml:lang="<?php bloginfo_rss( 'language' ); ?>"
</ins><span class="cx"> xmlns:thr="http://purl.org/syndication/thread/1.0"
</span><span class="cx"> <?php do_action('atom_ns'); do_action('atom_comments_ns'); ?>
</span><span class="cx"> >
</span></span></pre></div>
<a id="trunkwpincludesfeedatomphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/feed-atom.php (19783 => 19784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/feed-atom.php 2012-01-29 18:47:41 UTC (rev 19783)
+++ trunk/wp-includes/feed-atom.php 2012-01-29 19:56:33 UTC (rev 19784)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> <feed
</span><span class="cx"> xmlns="http://www.w3.org/2005/Atom"
</span><span class="cx"> xmlns:thr="http://purl.org/syndication/thread/1.0"
</span><del>- xml:lang="<?php echo get_option('rss_language'); ?>"
</del><ins>+ xml:lang="<?php bloginfo_rss( 'language' ); ?>"
</ins><span class="cx"> xml:base="<?php bloginfo_rss('url') ?>/wp-atom.php"
</span><span class="cx"> <?php do_action('atom_ns'); ?>
</span><span class="cx"> >
</span></span></pre></div>
<a id="trunkwpincludesfeedrssphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/feed-rss.php (19783 => 19784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/feed-rss.php 2012-01-29 18:47:41 UTC (rev 19783)
+++ trunk/wp-includes/feed-rss.php 2012-01-29 19:56:33 UTC (rev 19784)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> <description><?php bloginfo_rss('description') ?></description>
</span><span class="cx"> <lastBuildDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_lastpostmodified('GMT'), false); ?></lastBuildDate>
</span><span class="cx"> <docs>http://backend.userland.com/rss092</docs>
</span><del>- <language><?php echo get_option('rss_language'); ?></language>
</del><ins>+ <language><?php bloginfo_rss( 'language' ); ?></language>
</ins><span class="cx"> <?php do_action('rss_head'); ?>
</span><span class="cx">
</span><span class="cx"> <?php while (have_posts()) : the_post(); ?>
</span></span></pre></div>
<a id="trunkwpincludesfeedrss2php"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/feed-rss2.php (19783 => 19784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/feed-rss2.php 2012-01-29 18:47:41 UTC (rev 19783)
+++ trunk/wp-includes/feed-rss2.php 2012-01-29 19:56:33 UTC (rev 19784)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> <link><?php bloginfo_rss('url') ?></link>
</span><span class="cx"> <description><?php bloginfo_rss("description") ?></description>
</span><span class="cx"> <lastBuildDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_lastpostmodified('GMT'), false); ?></lastBuildDate>
</span><del>- <language><?php echo get_option('rss_language'); ?></language>
</del><ins>+ <language><?php bloginfo_rss( 'language' ); ?></language>
</ins><span class="cx"> <sy:updatePeriod><?php echo apply_filters( 'rss_update_period', 'hourly' ); ?></sy:updatePeriod>
</span><span class="cx"> <sy:updateFrequency><?php echo apply_filters( 'rss_update_frequency', '1' ); ?></sy:updateFrequency>
</span><span class="cx"> <?php do_action('rss2_head'); ?>
</span></span></pre></div>
<a id="trunkwpincludesversionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/version.php (19783 => 19784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/version.php 2012-01-29 18:47:41 UTC (rev 19783)
+++ trunk/wp-includes/version.php 2012-01-29 19:56:33 UTC (rev 19784)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @global int $wp_db_version
</span><span class="cx"> */
</span><del>-$wp_db_version = 19470;
</del><ins>+$wp_db_version = 19784;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the TinyMCE version
</span></span></pre>
</div>
</div>
</body>
</html>