Changeset 711

Timestamp:

01/04/2004 01:58:31 AM (22 years ago)

Author:

saxmatt

Message:

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

Location:

trunk/wp-admin

Files:

• install.php (modified) (1 diff)
• upgrade-functions.php (modified) (1 diff)
• upgrade.php (modified) (1 diff)

trunk/wp-admin/install.php

@@ -723 +723 @@
 upgrade_072();
 upgrade_100();
+upgrade_101();
 ?>
 

trunk/wp-admin/upgrade-functions.php

@@ -617 +617 @@
 }
 
+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'");
+}
+
 ?>

trunk/wp-admin/upgrade.php

@@ -52 +52 @@
     upgrade_072();
     upgrade_100();
+    upgrade_101();
 ?> 
 <h2>Step 1</h2>