[wp-cvs] wordpress/wp-admin install.php, 1.38,
1.39 optionhandler.php, 1.10, 1.11 upgrade-functions.php, 1.68, 1.69
Matthew Mullenweg
saxmatt at users.sourceforge.net
Sat Sep 4 21:52:03 UTC 2004
Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29032/wp-admin
Modified Files:
install.php optionhandler.php upgrade-functions.php
Log Message:
Remove optionvalues table.
Index: optionhandler.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/optionhandler.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** optionhandler.php 15 Jun 2004 23:24:35 -0000 1.10
--- optionhandler.php 4 Sep 2004 21:51:59 -0000 1.11
***************
*** 40,97 ****
BOOLSELECT;
//break;
-
- case 5: // select
- $ret = <<<SELECT
- <label for="$option_result->option_name">$option_result->option_name</label>$between
- <select name="$option_result->option_name" id="$option_result->option_name" $disabled>
- SELECT;
-
- $select = $wpdb->get_results("SELECT optionvalue, optionvalue_desc "
- ."FROM $wpdb->optionvalues "
- ."WHERE option_id = $option_result->option_id "
- ."ORDER BY optionvalue_seq");
- if ($select) {
- foreach($select as $option) {
- $ret .= '<option value="'.$option->optionvalue.'"';
- //error_log("comparing [$option_result->option_value] == [$option->optionvalue]");
- if ($option_result->option_value == $option->optionvalue) {
- $ret .=' selected="selected"';
- }
- $ret .= ">$option->optionvalue_desc</option>\n";
- }
- }
- $ret .= '</select>';
- return $ret;
- //break;
-
- case 7: // SQL select
- // first get the sql to run
- $sql = $wpdb->get_var("SELECT optionvalue FROM $wpdb->optionvalues WHERE option_id = $option_result->option_id");
- if (!$sql) {
- return $option_result->option_name . $editable;
- }
-
- // now we may need to do table name substitution
- eval("include('../wp-config.php');\$sql = \"$sql\";");
-
- $ret = <<<SELECT
- <label for="$option_result->option_name">$option_result->option_name</label>$between
- <select name="$option_result->option_name" $disabled>
- SELECT;
-
- $select = $wpdb->get_results("$sql");
- if ($select) {
- foreach($select as $option) {
- $ret .= '<option value="'.$option->value.'"';
- //error_log("comparing [$option_result->option_value] == [$option->optionvalue]");
- if ($option_result->option_value == $option->value) {
- $ret .=' selected="selected"';
- }
- $ret .= ">$option->label</option>\n";
- }
- }
- $ret .= '</select>';
- return $ret;
- //break;
} // end switch
--- 40,43 ----
***************
*** 103,116 ****
global $wpdb;
$msg = '';
- switch ($option->option_type) {
- case 6: // range
- // get range
- $range = $wpdb->get_row("SELECT optionvalue_max, optionvalue_min FROM $wpdb->optionvalues WHERE option_id = $option->option_id");
- if ($range) {
- if (($val < $range->optionvalue_min) || ($val > $range->optionvalue_max)) {
- $msg = "$name is outside the valid range ($range->optionvalue_min - $range->optionvalue_max). ";
- }
- }
- } // end switch
return $msg;
} // end validate_option
--- 49,52 ----
Index: install.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/install.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** install.php 21 Aug 2004 21:33:46 -0000 1.38
--- install.php 4 Sep 2004 21:51:53 -0000 1.39
***************
*** 384,409 ****
$q = $wpdb->query($query);
-
- // $query = "DROP TABLE IF EXISTS $wpdb->optionvalues";
- // $q = mysql_query($query) or mysql_doh("doh, can't drop the table \"$wpdb->optionvalues\" in the database.");
-
- $query = "
- CREATE TABLE $wpdb->optionvalues (
- option_id int(11) NOT NULL,
- optionvalue tinytext,
- optionvalue_desc varchar(255),
- optionvalue_max int(11),
- optionvalue_min int(11),
- optionvalue_seq int(11),
- UNIQUE (option_id, optionvalue(255)),
- INDEX (option_id, optionvalue_seq)
- )
- ";
- $q = $wpdb->query($query);
-
- ?>
-
- <?php
-
$option_data = array(
"INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES (1, 'integer')",
--- 384,387 ----
***************
*** 531,550 ****
"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(6,54,8)",
- // select data for what to show
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (49, 'days', 'days', null,null,1)",
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (49, 'posts', 'posts', null,null,2)",
- // select data for archive mode
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (50, 'daily', 'daily', null,null,1)",
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (50, 'weekly', 'weekly', null,null,2)",
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (50, 'monthly', 'monthly', null,null,3)",
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (50, 'postbypost','post by post',null,null,4)",
- // select data for time diff
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (51, 'hours', 'hours', 23, -23, null)",
- // select data for start of week
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (9, '0', 'Sunday', null,null,1)",
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (9, '1', 'Monday', null,null,2)",
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (9, '6', 'Saturday', null,null,3)",
-
-
// Add in a new page for POST DEFAULTS
--- 509,512 ----
***************
*** 570,592 ****
"INSERT INTO $wpdb->optiongroup_options (group_id, option_id, seq) VALUES(7,83,5 )",
- // select data for post_status
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (55, 'publish', 'Publish', null,null,1)",
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (55, 'draft', 'Draft', null,null,2)",
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (55, 'private', 'Private', null,null,3)",
-
- // select data for comment_status
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (56, 'open', 'Open', null,null,1)",
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (56, 'closed', 'Closed', null,null,2)",
-
- // select data for ping_status (aargh duplication!)
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (57, 'open', 'Open', null,null,1)",
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (57, 'closed', 'Closed', null,null,2)",
-
- // select data for pingback flag
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (58, '1', 'Checked', null,null,1)",
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (58, '0', 'Unchecked', null,null,2)",
-
- // sql select data for default
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (59, 'SELECT cat_id AS value, cat_name AS label FROM $wpdb->categories order by cat_name', '', null,null,1)",
);
--- 532,535 ----
***************
*** 648,656 ****
"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)",
-
- // select data for rating_type
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (62, 'number', 'Number', null,null,1)",
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (62, 'char', 'Character', null,null,2)",
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (62, 'image', 'Image', null,null,3)",
);
--- 591,594 ----
Index: upgrade-functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/upgrade-functions.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** upgrade-functions.php 30 Aug 2004 07:16:38 -0000 1.68
--- upgrade-functions.php 4 Sep 2004 21:51:59 -0000 1.69
***************
*** 98,111 ****
PRIMARY KEY (optiontype_id)
);
- CREATE TABLE $wpdb->optionvalues (
- option_id int(11) NOT NULL default '0',
- optionvalue tinytext,
- optionvalue_desc varchar(255) default NULL,
- optionvalue_max int(11) default NULL,
- optionvalue_min int(11) default NULL,
- optionvalue_seq int(11) default NULL,
- UNIQUE KEY option_id (option_id,optionvalue(255)),
- KEY option_id_2 (option_id,optionvalue_seq)
- );
CREATE TABLE $wpdb->post2cat (
rel_id int(11) NOT NULL auto_increment,
--- 98,101 ----
***************
*** 257,272 ****
)
");
- maybe_create_table($wpdb->optionvalues, "
- CREATE TABLE $wpdb->optionvalues (
- option_id int(11) NOT NULL,
- optionvalue tinytext,
- optionvalue_desc varchar(255),
- optionvalue_max int(11),
- optionvalue_min int(11),
- optionvalue_seq int(11),
- UNIQUE (option_id, optionvalue(255)),
- INDEX (option_id, optionvalue_seq)
- )
- ");
// TODO: REWRITE THIS
--- 247,250 ----
***************
*** 503,568 ****
}
}
-
- $option_values = array(
- // select data for what to show
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (49, 'days', 'days', null,null,1)",
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (49, 'posts', 'posts', null,null,2)",
- // select data for archive mode
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (50, 'daily', 'daily', null,null,1)",
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (50, 'weekly', 'weekly', null,null,2)",
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (50, 'monthly', 'monthly', null,null,3)",
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (50, 'postbypost','post by post',null,null,4)",
- // select data for time diff
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (51, 'hours', 'hours', 23, -23, null)",
- // select data for start of week
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (9, '0', 'Sunday', null,null,1)",
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (9, '1', 'Monday', null,null,2)",
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (9, '6', 'Saturday', null,null,3)",
-
-
- // 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"
-
-
-
-
- // select data for post_status
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (55, 'publish', 'Publish', null,null,1)",
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (55, 'draft', 'Draft', null,null,2)",
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (55, 'private', 'Private', null,null,3)",
-
- // select data for comment_status
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (56, 'open', 'Open', null,null,1)",
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (56, 'closed', 'Closed', null,null,2)",
-
- // select data for ping_status (aargh duplication!)
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (57, 'open', 'Open', null,null,1)",
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (57, 'closed', 'Closed', null,null,2)",
-
- // select data for pingback flag
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (58, '1', 'Checked', null,null,1)",
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (58, '0', 'Unchecked', null,null,2)",
-
- // sql select data for default
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (59, 'SELECT cat_id AS value, cat_name AS label FROM $wpdb->categories order by cat_name', '', null,null,1)",
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (62, 'number', 'Number', null,null,1)",
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (62, 'char', 'Character', null,null,2)",
- "INSERT INTO $wpdb->optionvalues (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq) VALUES (62, 'image', 'Image', null,null,3)"
- );
-
- foreach ($option_values as $query) {
- preg_match("|VALUES \(([0-9]+), '([^']+)'|", $query, $matches);
- $option_id = $matches[1];
- $value = $matches[2];
- if(!$wpdb->get_var("SELECT * FROM $wpdb->optionvalues WHERE option_id = '$option_id' AND optionvalue = '$value'")) {
- $wpdb->query($query);
- }
- }
-
if (file_exists('../wp-links/links.config.php')) {
--- 481,484 ----
***************
*** 636,659 ****
('$gid', '$oid', '$seq')");
}
!
! if (!$wpdb->get_row("SELECT * FROM $wpdb->optionvalues WHERE option_id = $oid AND optionvalue = 'auto'")) {
! $wpdb->query("INSERT INTO $wpdb->optionvalues
! (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq)
! VALUES
! ('$oid','auto', 'Automatic', NULL, NULL, 3)");
! }
! if (!$wpdb->get_row("SELECT * FROM $wpdb->optionvalues WHERE option_id = $oid AND optionvalue = 'none'")) {
! $wpdb->query("INSERT INTO $wpdb->optionvalues
! (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq)
! VALUES
! ('$oid', 'none', 'None', NULL, NULL, 1)");
! }
! if (!$wpdb->get_row("SELECT * FROM $wpdb->optionvalues WHERE option_id = $oid AND optionvalue = 'manual'")) {
! $wpdb->query("INSERT INTO $wpdb->optionvalues
! (option_id, optionvalue, optionvalue_desc, optionvalue_max, optionvalue_min, optionvalue_seq)
! VALUES
! ('$oid', 'manual', 'Manual', NULL, NULL, 2)");
! }
!
if (!$wpdb->get_var("SELECT option_id FROM $wpdb->options WHERE option_name = 'moderation_notify'")) {
$wpdb->query("INSERT INTO $wpdb->options
--- 552,556 ----
('$gid', '$oid', '$seq')");
}
!
if (!$wpdb->get_var("SELECT option_id FROM $wpdb->options WHERE option_name = 'moderation_notify'")) {
$wpdb->query("INSERT INTO $wpdb->options
***************
*** 721,725 ****
}
- $wpdb->query("UPDATE $wpdb->optionvalues SET optionvalue_max = 23 , optionvalue_min = -23 WHERE option_id = 51");
// fix upload users description
$wpdb->query("UPDATE $wpdb->options SET option_description = '...or you may authorize only some users. enter their logins here, separated by spaces. if you leave this variable blank, all users who have the minimum level are authorized to upload. example: \'barbara anne george\'' WHERE option_id = 37");
--- 618,621 ----
***************
*** 775,786 ****
function upgrade_101() {
global $wpdb;
! // Fix possible duplicate problem from CVS, we can REMOVE this later
! $option59 = $wpdb->get_results("SELECT * FROM $wpdb->optionvalues WHERE option_id = '59'");
! if (1 < count($option59)) {
! $wpdb->query("DELETE FROM $wpdb->optionvalues WHERE option_id = '59' AND optionvalue LIKE('%FROM order%')");
! }
!
! // Remove 'automatic' option for comment moderation until it actually does something
! $wpdb->query("DELETE FROM $wpdb->optionvalues WHERE optionvalue = 'auto'");
// Less intrusive default
$wpdb->query("ALTER TABLE `$wpdb->linkcategories` CHANGE `show_description` `show_description` ENUM( 'Y', 'N' ) DEFAULT 'N' NOT NULL");
--- 671,675 ----
function upgrade_101() {
global $wpdb;
!
// Less intrusive default
$wpdb->query("ALTER TABLE `$wpdb->linkcategories` CHANGE `show_description` `show_description` ENUM( 'Y', 'N' ) DEFAULT 'N' NOT NULL");
***************
*** 1015,1019 ****
}
!
}
--- 904,908 ----
}
! $wpdb->query('DROP TABLE IF EXISTS ' . $table_prefix . 'optionvalues');
}
More information about the cvs
mailing list