WP Merge.

Delete feed code and sql


git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@636 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 2 insertions, 9 deletions

diff --git a/wp-admin/upgrade-schema.php b/wp-admin/upgrade-schema.php
index 702fe4c..08ec537 100644
--- a/wp-admin/upgrade-schema.php
+++ b/wp-admin/upgrade-schema.php
@@ -279,11 +279,11 @@ function populate_options() {
 	add_option('use_linksupdate', 0);
 	add_option('template', 'default');
 	add_option('stylesheet', 'default');
-	add_option('comment_whitelist', 0);
+	add_option('comment_whitelist', 1);
 	add_option('page_uris');
 	add_option('blacklist_keys');
 	add_option('comment_registration', 0);
-	add_option('open_proxy_check', 1);
+	add_option('open_proxy_check', 0);
 	add_option('rss_language', 'en');
 	add_option('html_type', 'text/html');
 	// 1.5.1
@@ -310,13 +310,6 @@ function populate_options() {
 	add_option('default_link_category', 2);
 	add_option('show_on_front', 'posts');
 
-	add_site_option( 'customizefeed1', '0' );
-	add_site_option( 'customizefeed2', '0' );
-	add_site_option( 'dashboardfeed1', 'http://wordpress.org/development/feed/' );
-	add_site_option( 'dashboardfeed2', 'http://planet.wordpress.org/feed/' );
-	add_site_option( 'dashboardfeed1name', 'WordPress Development Blog' );
-	add_site_option( 'dashboardfeed2name', 'Other WordPress News' );
-
 	// 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');
 	foreach ($unusedoptions as $option) :