From e0ecd6fe486571de970f414ba75b527d2eb138e1 Mon Sep 17 00:00:00 2001 From: mikelittle Date: Mon, 29 Sep 2003 23:13:59 +0000 Subject: [PATCH] Removed 'search_engine_friendly_urls' and 'use_preview' options. git-svn-id: http://svn.automattic.com/wordpress/trunk@398 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/upgrade-071-to-072.php | 10 +++++----- wp-admin/wp-install.php | 8 ++++---- wp-settings.php | 1 - 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/wp-admin/upgrade-071-to-072.php b/wp-admin/upgrade-071-to-072.php index 6f469773f7..ad5f789b43 100644 --- a/wp-admin/upgrade-071-to-072.php +++ b/wp-admin/upgrade-071-to-072.php @@ -386,13 +386,13 @@ $option_data = array( "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(2,'blogfilename', 3, 'index.php', 'blogfilename is the name of the default file for your blog', 8, 20)", "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(3,'blogname', 3, 'my weblog', 'blogname is the name of your blog', 8, 20)", "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(4,'blogdescription', 3, 'babblings!', 'blogdescription is the description of your blog', 8, 40)", -"INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(6,'search_engine_friendly_urls', 2, '0', 'Querystring Configuration ** (don\'t change if you don\'t know what you\'re doing)', 8, 20)", +//"INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(6,'search_engine_friendly_urls', 2, '0', 'Querystring Configuration ** (don\'t change if you don\'t know what you\'re doing)', 8, 20)", "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(7,'new_users_can_blog', 2, '0', 'whether you want new users to be able to post entries once they have registered', 8, 20)", "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(8,'users_can_register', 2, '1', 'whether you want to allow users to register on your blog', 8, 20)", "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(54,'admin_email', 3, 'you@example.com', 'Your email (obvious eh?)', 8, 20)", // general blog setup "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(9 ,'start_of_week', 5, '1', 'day at the start of the week', 8, 20)", -"INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(10,'use_preview', 2, '1', 'Do you want to use the \'preview\' function', 8, 20)", +//"INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(10,'use_preview', 2, '1', 'Do you want to use the \'preview\' function', 8, 20)", "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(11,'use_bbcode', 2, '0', 'use BBCode, like [b]bold[/b]', 8, 20)", "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(12,'use_gmcode', 2, '0', 'use GreyMatter-styles: **bold** \\\\italic\\\\ __underline__', 8, 20)", "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(13,'use_quicktags', 2, '1', 'buttons for HTML tags (they won\'t work on IE Mac yet)', 8, 20)", @@ -452,7 +452,7 @@ $option_data = array( "INSERT INTO $tableoptiongroups (group_id, group_name, group_desc) VALUES(2, 'General blog settings', 'Things you\'ll probably want to tweak')", "INSERT INTO $tableoptiongroup_options (group_id, option_id, seq) VALUES(2,9 ,1 )", -"INSERT INTO $tableoptiongroup_options (group_id, option_id, seq) VALUES(2,10,2 )", +//"INSERT INTO $tableoptiongroup_options (group_id, option_id, seq) VALUES(2,10,2 )", "INSERT INTO $tableoptiongroup_options (group_id, option_id, seq) VALUES(2,11,3 )", "INSERT INTO $tableoptiongroup_options (group_id, option_id, seq) VALUES(2,12,4 )", "INSERT INTO $tableoptiongroup_options (group_id, option_id, seq) VALUES(2,13,5 )", @@ -502,7 +502,7 @@ $option_data = array( "INSERT INTO $tableoptiongroup_options (group_id, option_id, seq) VALUES(6,2,2)", "INSERT INTO $tableoptiongroup_options (group_id, option_id, seq) VALUES(6,3,3)", "INSERT INTO $tableoptiongroup_options (group_id, option_id, seq) VALUES(6,4,4)", -"INSERT INTO $tableoptiongroup_options (group_id, option_id, seq) VALUES(6,6,5)", +//"INSERT INTO $tableoptiongroup_options (group_id, option_id, seq) VALUES(6,6,5)", "INSERT INTO $tableoptiongroup_options (group_id, option_id, seq) VALUES(6,7,6)", "INSERT INTO $tableoptiongroup_options (group_id, option_id, seq) VALUES(6,8,7)", "INSERT INTO $tableoptiongroup_options (group_id, option_id, seq) VALUES(6,54,8)", @@ -721,7 +721,7 @@ foreach ($links_option_data as $query) { $query = "UPDATE $tableoptions SET option_value='".addslashes($new_users_can_blog )."' WHERE option_id=7"; $q = $wpdb->query($query); $query = "UPDATE $tableoptions SET option_value='".addslashes($users_can_register )."' WHERE option_id=8"; $q = $wpdb->query($query); $query = "UPDATE $tableoptions SET option_value='".addslashes($start_of_week )."' WHERE option_id=9"; $q = $wpdb->query($query); - $query = "UPDATE $tableoptions SET option_value='".addslashes($use_preview )."' WHERE option_id=10"; $q = $wpdb->query($query); + //$query = "UPDATE $tableoptions SET option_value='".addslashes($use_preview )."' WHERE option_id=10"; $q = $wpdb->query($query); $query = "UPDATE $tableoptions SET option_value='".addslashes($use_bbcode )."' WHERE option_id=11"; $q = $wpdb->query($query); $query = "UPDATE $tableoptions SET option_value='".addslashes($use_gmcode )."' WHERE option_id=12"; $q = $wpdb->query($query); $query = "UPDATE $tableoptions SET option_value='".addslashes($use_quicktags )."' WHERE option_id=13"; $q = $wpdb->query($query); diff --git a/wp-admin/wp-install.php b/wp-admin/wp-install.php index d02af73a27..e24fb82c09 100644 --- a/wp-admin/wp-install.php +++ b/wp-admin/wp-install.php @@ -367,13 +367,13 @@ $option_data = array( "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(2,'blogfilename', 3, 'index.php', 'blogfilename is the name of the default file for your blog', 8, 20)", "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(3,'blogname', 3, 'my weblog', 'blogname is the name of your blog', 8, 20)", "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(4,'blogdescription', 3, 'babblings!', 'blogdescription is the description of your blog', 8, 40)", -"INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(6,'search_engine_friendly_urls', 2, '0', 'Querystring Configuration ** (don\'t change if you don\'t know what you\'re doing)', 8, 20)", +//"INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(6,'search_engine_friendly_urls', 2, '0', 'Querystring Configuration ** (don\'t change if you don\'t know what you\'re doing)', 8, 20)", "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(7,'new_users_can_blog', 2, '0', 'whether you want new users to be able to post entries once they have registered', 8, 20)", "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(8,'users_can_register', 2, '1', 'whether you want to allow users to register on your blog', 8, 20)", "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(54,'admin_email', 3, 'you@example.com', 'Your email (obvious eh?)', 8, 20)", // general blog setup "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(9 ,'start_of_week', 5, '1', 'day at the start of the week', 8, 20)", -"INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(10,'use_preview', 2, '1', 'Do you want to use the \'preview\' function', 8, 20)", +//"INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(10,'use_preview', 2, '1', 'Do you want to use the \'preview\' function', 8, 20)", "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(11,'use_bbcode', 2, '0', 'use BBCode, like [b]bold[/b]', 8, 20)", "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(12,'use_gmcode', 2, '0', 'use GreyMatter-styles: **bold** \\\\italic\\\\ __underline__', 8, 20)", "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(13,'use_quicktags', 2, '1', 'buttons for HTML tags (they won\'t work on IE Mac yet)', 8, 20)", @@ -433,7 +433,7 @@ $option_data = array( "INSERT INTO $tableoptiongroups (group_id, group_name, group_desc) VALUES(2, 'General blog settings', 'Things you\'ll probably want to tweak')", "INSERT INTO $tableoptiongroup_options (group_id, option_id, seq) VALUES(2,9 ,1 )", -"INSERT INTO $tableoptiongroup_options (group_id, option_id, seq) VALUES(2,10,2 )", +//"INSERT INTO $tableoptiongroup_options (group_id, option_id, seq) VALUES(2,10,2 )", "INSERT INTO $tableoptiongroup_options (group_id, option_id, seq) VALUES(2,11,3 )", "INSERT INTO $tableoptiongroup_options (group_id, option_id, seq) VALUES(2,12,4 )", "INSERT INTO $tableoptiongroup_options (group_id, option_id, seq) VALUES(2,13,5 )", @@ -483,7 +483,7 @@ $option_data = array( "INSERT INTO $tableoptiongroup_options (group_id, option_id, seq) VALUES(6,2,2)", "INSERT INTO $tableoptiongroup_options (group_id, option_id, seq) VALUES(6,3,3)", "INSERT INTO $tableoptiongroup_options (group_id, option_id, seq) VALUES(6,4,4)", -"INSERT INTO $tableoptiongroup_options (group_id, option_id, seq) VALUES(6,6,5)", +//"INSERT INTO $tableoptiongroup_options (group_id, option_id, seq) VALUES(6,6,5)", "INSERT INTO $tableoptiongroup_options (group_id, option_id, seq) VALUES(6,7,6)", "INSERT INTO $tableoptiongroup_options (group_id, option_id, seq) VALUES(6,8,7)", "INSERT INTO $tableoptiongroup_options (group_id, option_id, seq) VALUES(6,54,8)", diff --git a/wp-settings.php b/wp-settings.php index 28ee1abac4..97050af2c1 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -13,7 +13,6 @@ if (!$_wp_installing) { $new_users_can_blog = get_settings('new_users_can_blog'); $users_can_register = get_settings('users_can_register'); $start_of_week = get_settings('start_of_week'); - $use_preview = get_settings('use_preview'); $use_bbcode = get_settings('use_bbcode'); $use_gmcode = get_settings('use_gmcode'); $use_quicktags = get_settings('use_quicktags');