Changeset 1596 for trunk/wp-admin/upgrade-functions.php

Timestamp:

09/04/2004 10:09:21 PM (21 years ago)

Author:

saxmatt

Message:

Remove optiongroups table.

File:

• trunk/wp-admin/upgrade-functions.php (modified) (6 diffs)

trunk/wp-admin/upgrade-functions.php

@@ -71 +71 @@
   seq int(11) NOT NULL default '0',
   PRIMARY KEY  (group_id,option_id)
-);
-CREATE TABLE $wpdb->optiongroups (
-  group_id int(11) NOT NULL auto_increment,
-  group_name varchar(64) NOT NULL default '',
-  group_desc varchar(255) default NULL,
-  group_longdesc tinytext,
-  PRIMARY KEY  (group_id)
 );
 CREATE TABLE $wpdb->options (
@@ -218 +211 @@
     )
     ");
-    maybe_create_table($wpdb->optiongroups, "
-    CREATE TABLE $wpdb->optiongroups (
-      group_id int(11) NOT NULL auto_increment,
-      group_name varchar(64) not null,
-      group_desc varchar(255),
-      group_longdesc tinytext,
-      PRIMARY KEY (group_id)
-    )
-    ");
     maybe_create_table($wpdb->optiongroup_options, "
     CREATE TABLE $wpdb->optiongroup_options (
@@ -329 +313 @@
     }
     
-    $option_groups = array(
-    "INSERT INTO $wpdb->optiongroups (group_id,  group_name, group_desc) VALUES (1, 'Other Options', 'Posts per page etc. Original options page')",
-    "INSERT INTO $wpdb->optiongroups (group_id,  group_name, group_desc) VALUES (2, 'General blog settings', 'Things you\'ll probably want to tweak')",
-    "INSERT INTO $wpdb->optiongroups (group_id,  group_name, group_desc) VALUES (3, 'RSS/RDF Feeds, Track/Ping-backs', 'Settings for RSS/RDF Feeds, Track/ping-backs')",
-    "INSERT INTO $wpdb->optiongroups (group_id,  group_name, group_desc) VALUES (4, 'File uploads', 'Settings for file uploads')",
-    "INSERT INTO $wpdb->optiongroups (group_id,  group_name, group_desc) VALUES (5, 'Blog-by-Email settings', 'Settings for blogging via email')",
-    "INSERT INTO $wpdb->optiongroups (group_id,  group_name, group_desc) VALUES (6, 'Base settings', 'Basic settings required to get your blog working')",
-    "INSERT INTO $wpdb->optiongroups (group_id,  group_name, group_desc) VALUES (7, 'Default post options', 'Default settings for new posts.')",
-    "INSERT INTO $wpdb->optiongroups (group_id,  group_name, group_desc) VALUES (8, 'Link Manager Settings', 'Various settings for the link manager.')",
-    "INSERT INTO $wpdb->optiongroups (group_id, group_name, group_desc) VALUES (9, 'Geo Options', 'Settings which control the posting and display of Geo Options')");
-
-    foreach ($option_groups as $query) {
-        $option_id = preg_match('|VALUES \(([0-9]+)|', $query, $matches);
-        $option_id = $matches[1];
-        if(!$wpdb->get_var("SELECT * FROM $wpdb->optiongroups WHERE group_id = '$option_id'")) {
-            $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 )",
@@ -515 +480 @@
 
     $oid = $wpdb->get_var("SELECT option_id FROM $wpdb->options WHERE option_name = 'comment_moderation'");     
-    $gid = $wpdb->get_var("SELECT group_id FROM $wpdb->optiongroups WHERE group_name = 'General blog settings'");
     $seq = $wpdb->get_var("SELECT MAX(seq) FROM $wpdb->optiongroup_options WHERE group_id = '$gid'");
     ++$seq;
@@ -693 +657 @@
         }
     }
-    
-    $wpdb->query("DELETE FROM $wpdb->optiongroups WHERE group_id = 1");
-    $wpdb->query("DELETE FROM $wpdb->optiongroups WHERE group_id = 2");
-    $wpdb->query("DELETE FROM $wpdb->optiongroups WHERE group_id = 3");
-    $wpdb->query("DELETE FROM $wpdb->optiongroups WHERE group_id = 4");
-    $wpdb->query("DELETE FROM $wpdb->optiongroups WHERE group_id = 5");
-    $wpdb->query("DELETE FROM $wpdb->optiongroups WHERE group_id = 6");
-    $wpdb->query("DELETE FROM $wpdb->optiongroups WHERE group_id = 7");
-    $wpdb->query("DELETE FROM $wpdb->optiongroups WHERE group_id = 9");
-
-    $wpdb->query("UPDATE $wpdb->optiongroups SET group_name = 'Link Manager' WHERE group_id = 8");
 
     // Add blog_charset option
@@ -879 +832 @@
     $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');
 }