Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 17:48:01 +01:00
Code Issues Projects Releases Wiki Activity

Fix CVS duplicate option value problem and removed automatic since it isn't used.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@711 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
saxmatt 2004-01-04 01:58:31 +00:00
parent 82c593a558
commit e474c0761a
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-admin/install.php
View File

@ -722,6 +722,7 @@ $q = $wpdb->query($query);
upgrade_071(); upgrade_071();
upgrade_072(); upgrade_072();
upgrade_100(); upgrade_100();
upgrade_101();
?> ?>
<p>User setup successful!</p> <p>User setup successful!</p>

12
wp-admin/upgrade-functions.php
View File

@ -616,4 +616,16 @@ function upgrade_100() {
} }
} }
function upgrade_101() {
global $wpdb, $tableoptionvalues;
// Fix possible duplicate problem from CVS
$option59 = $wpdb->get_results("SELECT * FROM $tableoptionvalues WHERE option_id = 59");
if (1 < count($option59)) {
$wpdb->query("DELETE FROM $tableoptionvalues WHERE option_id = 59 AND optionvalue LIKE('%FROM order%')");
}
// Remove 'automatic' option for comment moderation until it actually does something
$wpdb->query("DELETE FROM $tableoptionvalues WHERE optionvalue = 'auto'");
}
?> ?>

1
wp-admin/upgrade.php
View File

@ -51,6 +51,7 @@ switch($step) {
upgrade_071(); upgrade_071();
upgrade_072(); upgrade_072();
upgrade_100(); upgrade_100();
upgrade_101();
?> ?>
<h2>Step 1</h2> <h2>Step 1</h2>
<p>There's actually only one step. So if you see this, you're done. <a href="../">Have fun</a>! </p> <p>There's actually only one step. So if you see this, you're done. <a href="../">Have fun</a>! </p>