[wp-cvs] wordpress/wp-admin install.php, 1.39, 1.40 upgrade-functions.php, 1.69, 1.70

[Matthew Mullenweg]

Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31168/wp-admin

Modified Files:
	install.php upgrade-functions.php 
Log Message:
Remove optiontypes  table.

Index: install.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/install.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** install.php	4 Sep 2004 21:51:53 -0000	1.39
--- install.php	4 Sep 2004 22:04:18 -0000	1.40
***************
*** 343,362 ****
  $q = $wpdb->query($query);
  
- // $query = "DROP TABLE IF EXISTS $tableoptiontypes";
- // $q = mysql_query($query) or mysql_doh("doh, can't drop the table \"$tableoptiontypes\" in the database.");
- 
- $query = "
- CREATE TABLE $wpdb->optiontypes (
-   optiontype_id int(11) NOT NULL auto_increment,
-   optiontype_name varchar(64) NOT NULL,
-   PRIMARY KEY (optiontype_id)
- )
- ";
- $q = $wpdb->query($query);
- 
- 
- // $query = "DROP TABLE IF EXISTS $tableoptiongroups";
- // $q = mysql_query($query) or mysql_doh("doh, can't drop the table \"$tableoptiongroups\" in the database.");
- 
  $query = "
  CREATE TABLE $wpdb->optiongroups (
--- 343,346 ----
***************
*** 385,397 ****
  
  $option_data = array(
- "INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES (1, 'integer')",
- "INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES (2, 'boolean')",
- "INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES (3, 'string')",
- "INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES (4, 'date')",
- "INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES (5, 'select')",
- "INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES (6, 'range')",
- "INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES (7, 'sqlselect')",
- "INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES (8, 'float')",
- 
  //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)",
--- 369,372 ----

Index: upgrade-functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/upgrade-functions.php,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** upgrade-functions.php	4 Sep 2004 21:51:59 -0000	1.69
--- upgrade-functions.php	4 Sep 2004 22:04:19 -0000	1.70
***************
*** 93,101 ****
    PRIMARY KEY  (option_id,blog_id,option_name)
  );
- CREATE TABLE $wpdb->optiontypes (
-   optiontype_id int(11) NOT NULL auto_increment,
-   optiontype_name varchar(64) NOT NULL default '',
-   PRIMARY KEY  (optiontype_id)
- );
  CREATE TABLE $wpdb->post2cat (
    rel_id int(11) NOT NULL auto_increment,
--- 93,96 ----
***************
*** 223,233 ****
  	)
  	");
- 	maybe_create_table($wpdb->optiontypes, "
- 	CREATE TABLE $wpdb->optiontypes (
- 	  optiontype_id int(11) NOT NULL auto_increment,
- 	  optiontype_name varchar(64) NOT NULL,
- 	  PRIMARY KEY (optiontype_id)
- 	)
- 	");
  	maybe_create_table($wpdb->optiongroups, "
  	CREATE TABLE $wpdb->optiongroups (
--- 218,221 ----
***************
*** 247,266 ****
  	)
  	");
- 	
- 	// TODO: REWRITE THIS
- 	$option_types = array(
- 		"1" => "INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES ('1', 'integer')",
- 		"2" => "INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES ('2', 'boolean')",
- 		"3" => "INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES ('3', 'string')",
- 		"4" => "INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES ('4', 'date')",
- 		"5" => "INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES ('5', 'select')",
- 		"6" => "INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES ('6', 'range')",
- 		"7" => "INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES ('7', 'sqlselect')");
- 
- 	foreach ($option_types as $option_id => $query) {
- 		if(!$wpdb->get_var("SELECT * FROM $wpdb->optiontypes WHERE optiontype_id = '$option_id'")) {
- 			$wpdb->query($query);
- 		}
- 	}
  
  	// Guess a site URI
--- 235,238 ----
***************
*** 904,908 ****
--- 876,882 ----
  	}
  
+ 	// Obsolete tables
  	$wpdb->query('DROP TABLE IF EXISTS ' . $table_prefix . 'optionvalues');
+ 	$wpdb->query('DROP TABLE IF EXISTS ' . $table_prefix . 'optiontypes');
  }