From 5738851fa56b2f64e50baf1cae59d6a16c03f820 Mon Sep 17 00:00:00 2001
From: saxmatt <saxmatt@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 14 Feb 2005 03:20:29 +0000
Subject: [PATCH] Remove unused options.

git-svn-id: http://svn.automattic.com/wordpress/trunk@2314 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/options-misc.php   | 2 +-
 wp-admin/upgrade-schema.php | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/wp-admin/options-misc.php b/wp-admin/options-misc.php
index 7ffd0f57a5..d5ac5a4925 100644
--- a/wp-admin/options-misc.php
+++ b/wp-admin/options-misc.php
@@ -12,7 +12,7 @@ include('admin-header.php');
 <h2><?php _e('Miscellaneous Options') ?></h2> 
 <form name="miscoptions" method="post" action="options.php"> 
 	<input type="hidden" name="action" value="update" />
-	<input type="hidden" name="page_options" value="'hack_file','use_fileupload','fileupload_realpath','fileupload_url','fileupload_allowedtypes','fileupload_maxk','fileupload_maxk','fileupload_minlevel','use_geo_positions','use_linksupdate','weblogs_xml_url','links_updated_date_format','links_recently_updated_prepend','links_recently_updated_append'" /> 
+	<input type="hidden" name="page_options" value="'hack_file','use_fileupload','fileupload_realpath','fileupload_url','fileupload_allowedtypes','fileupload_maxk','fileupload_maxk','fileupload_minlevel','use_geo_positions','use_linksupdate'" /> 
 	<fieldset class="options">
 	<legend>
 	<input name="use_fileupload" type="checkbox" id="use_fileupload" value="1" <?php checked('1', get_settings('use_fileupload')); ?> />
diff --git a/wp-admin/upgrade-schema.php b/wp-admin/upgrade-schema.php
index 4e870ff179..3d68b0d55d 100644
--- a/wp-admin/upgrade-schema.php
+++ b/wp-admin/upgrade-schema.php
@@ -185,7 +185,6 @@ function populate_options() {
 	add_option('what_to_show', 'posts');
 	add_option('date_format', 'F j, Y');
 	add_option('time_format', 'g:i a');
-	add_option('weblogs_xml_url', 'http://static.wordpress.org/changes.xml');
 	add_option('links_updated_date_format', 'F j, Y g:i a');
 	add_option('links_recently_updated_prepend', '<em>');
 	add_option('links_recently_updated_append', '</em>');
@@ -216,7 +215,7 @@ function populate_options() {
 	add_option('open_proxy_check', 1);
 
 	// 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', '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');
+	$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');
 	foreach ($unusedoptions as $option) :
 		delete_option($option);
 	endforeach;