diff --git a/wp-admin/includes/export.php b/wp-admin/includes/export.php
index 6aa85a85a3..412a629761 100644
--- a/wp-admin/includes/export.php
+++ b/wp-admin/includes/export.php
@@ -331,7 +331,7 @@ function export_wp( $args = array() ) {
-
+
diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php
index a84336619f..b0d7b2d8ad 100644
--- a/wp-admin/includes/schema.php
+++ b/wp-admin/includes/schema.php
@@ -409,7 +409,6 @@ function populate_options() {
'comment_whitelist' => 1,
'blacklist_keys' => '',
'comment_registration' => 0,
- 'rss_language' => 'en',
'html_type' => 'text/html',
// 1.5.1
@@ -524,7 +523,7 @@ function populate_options() {
if ( !__get_option('home') ) update_option('home', $guessurl);
// Delete unused options
- $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');
+ $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');
foreach ( $unusedoptions as $option )
delete_option($option);
diff --git a/wp-app.php b/wp-app.php
index d84b58aea7..7e0edba91e 100644
--- a/wp-app.php
+++ b/wp-app.php
@@ -1077,7 +1077,7 @@ EOD;
$prev_page = ($page - 1) < 1 ? null : $page - 1;
$last_page = ((int)$last_page == 1 || (int)$last_page == 0) ? null : (int) $last_page;
$self_page = $page > 1 ? $page : null;
-?> >
+?> >
the_entries_url() ?>
@@ -1150,7 +1150,7 @@ EOD;
*/
function echo_entry() { ?>
+ xmlns:app="ATOMPUB_NS ?>" xml:lang="">
ID ); ?>
diff --git a/wp-includes/feed-atom-comments.php b/wp-includes/feed-atom-comments.php
index aca98bdb37..94e89f52c4 100644
--- a/wp-includes/feed-atom-comments.php
+++ b/wp-includes/feed-atom-comments.php
@@ -10,7 +10,7 @@ echo ''
?>
>
diff --git a/wp-includes/feed-atom.php b/wp-includes/feed-atom.php
index db8d66b800..f8f08c87e7 100644
--- a/wp-includes/feed-atom.php
+++ b/wp-includes/feed-atom.php
@@ -12,7 +12,7 @@ echo ''; ?>
>
diff --git a/wp-includes/feed-rss.php b/wp-includes/feed-rss.php
index b26897d3e6..2e6c933845 100644
--- a/wp-includes/feed-rss.php
+++ b/wp-includes/feed-rss.php
@@ -16,7 +16,7 @@ echo ''; ?>
http://backend.userland.com/rss092
-
+
diff --git a/wp-includes/feed-rss2.php b/wp-includes/feed-rss2.php
index 5bf67f2f7c..8fc51d55ac 100644
--- a/wp-includes/feed-rss2.php
+++ b/wp-includes/feed-rss2.php
@@ -26,7 +26,7 @@ echo ''; ?>
-
+
diff --git a/wp-includes/version.php b/wp-includes/version.php
index c631101978..a21710fdcb 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -11,7 +11,7 @@ $wp_version = '3.4-alpha-19719';
*
* @global int $wp_db_version
*/
-$wp_db_version = 19470;
+$wp_db_version = 19784;
/**
* Holds the TinyMCE version