From 009d89ec5bf6c8d079bcedcf71de0e12e6cecf5a Mon Sep 17 00:00:00 2001 From: saxmatt Date: Sat, 4 Sep 2004 22:15:46 +0000 Subject: [PATCH] Remove optiongroup_options table. git-svn-id: http://svn.automattic.com/wordpress/trunk@1597 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/install.php | 117 ------------------------- wp-admin/options.php | 10 +-- wp-admin/upgrade-functions.php | 152 +-------------------------------- wp-includes/functions.php | 1 - wp-settings.php | 4 - 5 files changed, 3 insertions(+), 281 deletions(-) diff --git a/wp-admin/install.php b/wp-admin/install.php index 1ecfe01e0..32b886b63 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -342,16 +342,6 @@ CREATE TABLE $wpdb->options ( "; $q = $wpdb->query($query); -$query = " -CREATE TABLE $wpdb->optiongroup_options ( - group_id int(11) NOT NULL, - option_id int(11) NOT NULL, - seq int(11) NOT NULL, - PRIMARY KEY (group_id, option_id) -) -"; -$q = $wpdb->query($query); - $option_data = array( //base options from b2cofig "INSERT INTO $wpdb->options (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(1,'siteurl', 3, '$guessurl', 'siteurl is your blog\'s URL: for example, \'http://example.com/wordpress\' (no trailing slash !)', 8, 30)", @@ -402,74 +392,6 @@ $option_data = array( "INSERT INTO $wpdb->options (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(52,'date_format', 3, 'n/j/Y', 'see note for format characters', 4, 20)", "INSERT INTO $wpdb->options (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(53,'time_format', 3, 'g:i a', 'see note for format characters', 4, 20)", -//'pages' of options -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(1,48,1 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(1,49,2 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(1,50,3 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(1,51,4 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(1,52,5 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(1,53,6 )", - -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(2,9 ,1 )", -//"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(2,10,2 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(2,11,3 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(2,12,4 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(2,13,5 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(2,14,6 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(2,15,7 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(2,16,8 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(2,17,9 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(2,18,10)", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(2,19,11)", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(2,20,12)", - -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(3,21,1 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(3,22,2 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(3,23,3 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(3,24,4 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(3,25,5 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(3,26,6 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(3,27,7 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(3,28,8 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(3,29,9 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(3,30,10)", - -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(4,31,1 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(4,32,2 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(4,33,3 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(4,34,4 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(4,35,5 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(4,36,6 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(4,37,7 )", - -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(5,38,1 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(5,39,2 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(5,40,3 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(5,41,4 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(5,42,5 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(5,43,6 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(5,44,7 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(5,45,8 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(5,46,9 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(5,47,10)", - -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(6,1,1)", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(6,2,2)", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(6,3,3)", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(6,4,4)", -//"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(6,6,5)", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(6,7,6)", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(6,8,7)", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(6,54,8)", - -// Add in a new page for POST DEFAULTS - -// default_post_status select one of publish draft private -// default_comment_status select one of open closed -// default_ping_status select one of open closed -// default_pingback_flag select one of checked unchecked -// default_post_category sql_select "SELECT cat_id AS value, cat_name AS label FROM $wpdb->categories order by cat_name" - "INSERT INTO $wpdb->options (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(55,'default_post_status', 5, 'publish', 'The default state of each new post', 8, 20)", "INSERT INTO $wpdb->options (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(56,'default_comment_status', 5, 'open', 'The default state of comments for each new post', 8, 20)", "INSERT INTO $wpdb->options (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(57,'default_ping_status', 5, 'open', 'The default ping state for each new post', 8, 20)", @@ -477,13 +399,6 @@ $option_data = array( "INSERT INTO $wpdb->options (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(59,'default_post_category', 7, '1', 'The default category for each new post', 8, 20)", "INSERT INTO $wpdb->options (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(83,'default_post_edit_rows', 1, '9', 'The number of rows in the edit post form (min 3, max 100)', 8, 5)", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(7,55,1 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(7,56,2 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(7,57,3 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(7,58,4 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(7,59,5 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(7,83,5 )", - ); foreach ($option_data as $query) { @@ -517,31 +432,6 @@ $links_option_data = array( "INSERT INTO $wpdb->options (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(80,'links_recently_updated_prepend', 3, '>>', 'The text to prepend to a recently updated link', 8, 10)", "INSERT INTO $wpdb->options (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(81,'links_recently_updated_append', 3, '<<', 'The text to append to a recently updated link', 8, 20)", "INSERT INTO $wpdb->options (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(82,'links_recently_updated_time', 1, '120', 'The time in minutes to consider a link recently updated', 8, 20)", - -//group them together -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(8,60,1 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(8,61,2 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(8,62,3 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(8,63,4 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(8,64,5 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(8,65,6 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(8,66,7 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(8,67,8 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(8,68,9 )", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(8,69,10)", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(8,70,11)", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(8,71,12)", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(8,72,13)", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(8,73,14)", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(8,74,15)", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(8,75,16)", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(8,76,17)", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(8,77,18)", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(8,78,19)", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(8,79,20)", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(8,80,21)", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(8,81,22)", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(8,82,23)", ); foreach ($links_option_data as $query) { @@ -557,13 +447,6 @@ $geo_option_data = array( "INSERT INTO $wpdb->options (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(85,'use_default_geourl', 2, '1','enables placement of default GeoURL ICBM location even when no other specified', 8, 20)", "INSERT INTO $wpdb->options (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(86,'default_geourl_lat ', 8, 0.0, 'The default Latitude ICBM value - see here', 8, 20)", "INSERT INTO $wpdb->options (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(87,'default_geourl_lon', 8, 0.0, 'The default Longitude ICBM value', 8, 20)", - - -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(9,84,1)", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(9,85,1)", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(9,86,1)", -"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(9,87,1)", - ); foreach ($geo_option_data as $query) { diff --git a/wp-admin/options.php b/wp-admin/options.php index 8e878dd09..3ff0a8284 100644 --- a/wp-admin/options.php +++ b/wp-admin/options.php @@ -136,15 +136,7 @@ default: get_results("SELECT * FROM $wpdb->options LEFT JOIN $wpdb->optiongroup_options ON $wpdb->options.option_id = $wpdb->optiongroup_options.option_id ORDER BY option_name"); -else : -$options = $wpdb->get_results(" -SELECT -$wpdb->options.option_id, option_name, option_type, option_value, option_width, option_height, option_description, option_admin_level -FROM $wpdb->options LEFT JOIN $wpdb->optiongroup_options ON $wpdb->options.option_id = $wpdb->optiongroup_options.option_id -WHERE group_id = $option_group_id -ORDER BY seq -"); +$options = $wpdb->get_results("SELECT * FROM $wpdb->options ORDER BY option_name"); endif; foreach ($options as $option) : diff --git a/wp-admin/upgrade-functions.php b/wp-admin/upgrade-functions.php index 8f485304e..cb243b91d 100644 --- a/wp-admin/upgrade-functions.php +++ b/wp-admin/upgrade-functions.php @@ -65,12 +65,6 @@ CREATE TABLE $wpdb->links ( KEY link_category (link_category), KEY link_visible (link_visible) ); -CREATE TABLE $wpdb->optiongroup_options ( - group_id int(11) NOT NULL default '0', - option_id int(11) NOT NULL default '0', - seq int(11) NOT NULL default '0', - PRIMARY KEY (group_id,option_id) -); CREATE TABLE $wpdb->options ( option_id int(11) NOT NULL auto_increment, blog_id int(11) NOT NULL default '0', @@ -210,14 +204,6 @@ function upgrade_072() { PRIMARY KEY (option_id, blog_id, option_name) ) "); - maybe_create_table($wpdb->optiongroup_options, " - CREATE TABLE $wpdb->optiongroup_options ( - group_id int(11) NOT NULL, - option_id int(11) NOT NULL, - seq int(11) NOT NULL, - PRIMARY KEY (group_id, option_id) - ) - "); // Guess a site URI $guessurl = preg_replace('|/wp-admin/.*|i', '', 'http://' . $HTTP_HOST . $REQUEST_URI); @@ -311,112 +297,6 @@ $guessurl = preg_replace('|/wp-admin/.*|i', '', 'http://' . $HTTP_HOST . $REQUES $wpdb->query($query); } } - - $optiongroup_options = array ( "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (1,48,1 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (1,49,2 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (1,50,3 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (1,51,4 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (1,52,5 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (1,53,6 )", - - - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (2,9 ,1 )", - //"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (2,10,2 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (2,11,3 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (2,12,4 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (2,13,5 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (2,14,6 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (2,15,7 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (2,16,8 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (2,17,9 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (2,18,10)", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (2,19,11)", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (2,20,12)", - - - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (3,21,1 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (3,22,2 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (3,23,3 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (3,24,4 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (3,25,5 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (3,26,6 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (3,27,7 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (3,28,8 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (3,29,9 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (3,30,10)", - - - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (4,31,1 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (4,32,2 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (4,33,3 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (4,34,4 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (4,35,5 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (4,36,6 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (4,37,7 )", - - - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (5,38,1 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (5,39,2 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (5,40,3 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (5,41,4 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (5,42,5 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (5,43,6 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (5,44,7 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (5,45,8 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (5,46,9 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (5,47,10)", - - - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (6,1,1)", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (6,2,2)", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (6,3,3)", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (6,4,4)", - //"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (6,6,5)", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (6,7,6)", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (6,8,7)", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (6,54,8)", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (7,55,1 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (7,56,2 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (7,57,3 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (7,58,4 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (7,59,5 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (7,83,5 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (8,60,1 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (8,61,2 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (8,62,3 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (8,63,4 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (8,64,5 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (8,65,6 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (8,66,7 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (8,67,8 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (8,68,9 )", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (8,69,10)", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (8,70,11)", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (8,71,12)", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (8,72,13)", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (8,73,14)", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (8,74,15)", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (8,75,16)", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (8,76,17)", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (8,77,18)", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (8,78,19)", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (8,79,20)", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (8,80,21)", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (8,81,22)", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (8,82,23)", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (9,84,1)", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (9,85,1)", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (9,86,1)", - "INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES (9,87,1)", - ); - - foreach ($optiongroup_options as $query) { - preg_match('|VALUES \([0-9]+,([0-9]+)|', $query, $matches); - $option_id = $matches[1]; - if(!$wpdb->get_var("SELECT * FROM $wpdb->optiongroup_options WHERE option_id = '$option_id'")) { - $wpdb->query($query); - } - } if (file_exists('../wp-links/links.config.php')) { include('../wp-links/links.config.php'); @@ -478,16 +358,6 @@ function upgrade_100() { ('0', '0', 'comment_moderation', 'Y', '5',' none', 20, 8, 'If enabled, comments will only be shown after they have been approved.', 8)"); } - $oid = $wpdb->get_var("SELECT option_id FROM $wpdb->options WHERE option_name = 'comment_moderation'"); - $seq = $wpdb->get_var("SELECT MAX(seq) FROM $wpdb->optiongroup_options WHERE group_id = '$gid'"); - ++$seq; - if (!$wpdb->get_row("SELECT * FROM $wpdb->optiongroup_options WHERE group_id = '$gid' AND option_id = '$oid'")) { - $wpdb->query("INSERT INTO $wpdb->optiongroup_options - (group_id, option_id, seq) - VALUES - ('$gid', '$oid', '$seq')"); - } - if (!$wpdb->get_var("SELECT option_id FROM $wpdb->options WHERE option_name = 'moderation_notify'")) { $wpdb->query("INSERT INTO $wpdb->options (option_id, blog_id, option_name, option_can_override, option_type, option_value, option_width, option_height, option_description, option_admin_level) @@ -495,15 +365,6 @@ function upgrade_100() { ('0', '0', 'moderation_notify' , 'Y', '2', '1', 20, 8, 'Set this to true if you want to be notified about new comments that wait for approval', 8)"); } - $oid = $wpdb->get_var("SELECT option_id FROM $wpdb->options WHERE option_name = 'moderation_notify'"); - $seq = $wpdb->get_var("SELECT MAX(seq) FROM $wpdb->optiongroup_options WHERE group_id = '$gid'"); - ++$seq; - if (!$wpdb->get_row("SELECT * FROM $wpdb->optiongroup_options WHERE group_id = '$gid' AND option_id = '$oid'")) { - $wpdb->query("INSERT INTO $wpdb->optiongroup_options - (group_id, option_id, seq) - VALUES - ('$gid', '$oid', '$seq')"); - } // Get the title and ID of every post, post_name to check if it already has a value $posts = $wpdb->get_results("SELECT ID, post_title, post_name FROM $wpdb->posts WHERE post_name = ''"); if ($posts) { @@ -535,22 +396,12 @@ function upgrade_100() { (`option_id`, `blog_id`, `option_name`, `option_can_override`, `option_type`, `option_value`, `option_width`, `option_height`, `option_description`, `option_admin_level`) VALUES ('', '0', 'gzipcompression', 'Y', '2', '0', '20', '8', 'Whether your output should be gzipped or not. Enable this if you don’t already have mod_gzip running.', '8');"); - $optionid = $wpdb->get_var("SELECT option_id FROM $wpdb->options WHERE option_name = 'gzipcompression'"); - $wpdb->query("INSERT INTO $wpdb->optiongroup_options - (group_id, option_id, seq) - VALUES - (2, $optionid, 5)"); - } +} if (!$wpdb->get_var("SELECT option_id FROM $wpdb->options WHERE option_name = 'hack_file'")) { $wpdb->query("INSERT INTO `$wpdb->options` ( `option_id` , `blog_id` , `option_name` , `option_can_override` , `option_type` , `option_value` , `option_width` , `option_height` , `option_description` , `option_admin_level` ) VALUES ('', '0', 'hack_file', 'Y', '2', '0', '20', '8', 'Set this to true if you plan to use a hacks file. This is a place for you to store code hacks that won’t be overwritten when you upgrade. The file must be in your wordpress root and called my-hacks.php', '8')"); - $optionid = $wpdb->get_var("SELECT option_id FROM $wpdb->options WHERE option_name = 'hack_file'"); - $wpdb->query("INSERT INTO $wpdb->optiongroup_options - (group_id, option_id, seq) - VALUES - (2, $optionid, 5)"); } // fix upload users description @@ -832,6 +683,7 @@ function upgrade_130() { $wpdb->query('DROP TABLE IF EXISTS ' . $table_prefix . 'optionvalues'); $wpdb->query('DROP TABLE IF EXISTS ' . $table_prefix . 'optiontypes'); $wpdb->query('DROP TABLE IF EXISTS ' . $table_prefix . 'optiongroups'); + $wpdb->query('DROP TABLE IF EXISTS ' . $table_prefix . 'optiongroup_options'); } // The functions we use to actually do stuff diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 224f21f27..9f07f4aab 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -375,7 +375,6 @@ function delete_option($name) { // Get the ID, if no ID then return $option_id = $wpdb->get_var("SELECT option_id FROM $wpdb->options WHERE option_name = '$name'"); if (!$option_id) return false; - $wpdb->query("DELETE FROM $wpdb->optiongroup_options WHERE option_id = '$option_id'"); $wpdb->query("DELETE FROM $wpdb->options WHERE option_name = '$name'"); return true; } diff --git a/wp-settings.php b/wp-settings.php index 6febf0afe..7ce663644 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -25,8 +25,6 @@ $wpdb->comments = $table_prefix . 'comments'; $wpdb->links = $table_prefix . 'links'; $wpdb->linkcategories = $table_prefix . 'linkcategories'; $wpdb->options = $table_prefix . 'options'; -$wpdb->optiongroups = $table_prefix . 'optiongroups'; -$wpdb->optiongroup_options = $table_prefix . 'optiongroup_options'; $wpdb->postmeta = $table_prefix . 'postmeta'; // We're going to need to keep this around for a few months even though we're not using it internally @@ -39,8 +37,6 @@ $tablecomments = $wpdb->comments; $tablelinks = $wpdb->links; $tablelinkcategories = $wpdb->linkcategories; $tableoptions = $wpdb->options; -$tableoptiongroups = $wpdb->optiongroups; -$tableoptiongroup_options = $wpdb->optiongroup_options; $tablepostmeta = $wpdb->postmeta; require (ABSPATH . WPINC . '/functions.php');