Skip to content

Commit eac6ef3

Browse files
mm
committed
git-svn-id: https://develop.svn.wordpress.org/trunk@2318 602fd350-edb4-49c9-b593-d223f7449a82
1 parent f2f1c30 commit eac6ef3

4 files changed

Lines changed: 22 additions & 23 deletions

File tree

‎wp-admin/upgrade-schema.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,10 @@ function populate_options() {
213213
add_option('blacklist_keys');
214214
add_option('comment_registration', 0);
215215
add_option('open_proxy_check', 1);
216+
add_option('rss_language', 'en');
216217

217218
// Delete unused options
218-
$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', 'rss_language', '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');
219+
$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');
219220
foreach ($unusedoptions as $option) :
220221
delete_option($option);
221222
endforeach;

‎wp-atom.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
<?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; ?>
1515
<feed version="0.3"
1616
xmlns="http://purl.org/atom/ns#"
17-
xmlns:dc="http://purl.org/dc/elements/1.1/">
17+
xmlns:dc="http://purl.org/dc/elements/1.1/"
18+
xml:lang="<?php echo get_option('rss_language'); ?>"
19+
>
1820
<title><?php bloginfo_rss('name') ?></title>
1921
<link rel="alternate" type="text/html" href="<?php bloginfo_rss('home') ?>" />
2022
<tagline><?php bloginfo_rss("description") ?></tagline>

‎wp-rss.php‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,24 @@
1414
<?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; ?>
1515
<!-- generator="wordpress/<?php echo $wp_version ?>" -->
1616
<rss version="0.92">
17-
<channel>
18-
<title><?php bloginfo_rss('name') ?></title>
19-
<link><?php bloginfo_rss('url') ?></link>
20-
<description><?php bloginfo_rss('description') ?></description>
17+
<channel>
18+
<title><?php bloginfo_rss('name') ?></title>
19+
<link><?php bloginfo_rss('url') ?></link>
20+
<description><?php bloginfo_rss('description') ?></description>
2121
<lastBuildDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_lastpostmodified('GMT'), 0); ?></lastBuildDate>
22-
<docs>http://backend.userland.com/rss092</docs>
22+
<docs>http://backend.userland.com/rss092</docs>
23+
<language><?php echo get_option('rss_language'); ?></language>
2324

2425
<?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_wp(); ?>
25-
<item>
26-
<title><?php the_title_rss() ?></title>
27-
<?php
28-
if (get_settings('rss_use_excerpt')) {
29-
?>
30-
<description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
31-
<?php
32-
} else { // use content
33-
?>
34-
<description><?php the_content_rss('', 0, '', get_settings('rss_excerpt_length')) ?></description>
35-
<?php
36-
} // end else use content
37-
?>
38-
<link><?php permalink_single_rss() ?></link>
39-
</item>
26+
<item>
27+
<title><?php the_title_rss() ?></title>
28+
<?php if (get_settings('rss_use_excerpt')) { ?>
29+
<description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
30+
<?php } else { // use content ?>
31+
<description><?php the_content_rss('', 0, '', get_settings('rss_excerpt_length')) ?></description>
32+
<?php } ?>
33+
<link><?php permalink_single_rss() ?></link>
34+
</item>
4035
<?php $items_count++; if (($items_count == get_settings('posts_per_rss')) && empty($m)) { break; } } } ?>
41-
</channel>
36+
</channel>
4237
</rss>

‎wp-rss2.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<description><?php bloginfo_rss("description") ?></description>
2727
<pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_lastpostmodified('GMT'), 0); ?></pubDate>
2828
<generator>http://wordpress.org/?v=<?php bloginfo_rss('version'); ?></generator>
29+
<language><?php echo get_option('rss_language'); ?></language>
2930

3031
<?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_wp(); ?>
3132
<item>

0 commit comments

Comments
 (0)