Ticket #1587: ticket-1587-patch.diff

wp-includes/version.php

@@ -3 +3 @@
 // This just holds the version number, in a separate file so we can bump it without cluttering the SVN
 
 $wp_version = '1.6-ALPHA-2-still-dont-use';
-$wp_db_version = 2966;
+$wp_db_version = 3022;
 
 ?>
+ No newline at end of file

wp-admin/upgrade-functions.php

@@ -33 +33 @@
         if ( $wp_current_db_version < 2966 )
                 upgrade_160();
 
+        if ( $wp_current_db_version < 3022 )
+                upgrade_3022();
+
         save_mod_rewrite_rules();
         
-        update_option('db_version', $wp_db_version);
+    update_option('db_version', $wp_db_version);
 }
 
 function upgrade_100() {
@@ -302 +305 @@
         }
 }
 
+function upgrade_3022() {
+        global $wpdb;
+    // update link categories table to use enums
+    $wpdb->query("ALTER TABLE $wpdb->linkcategories MODIFY COLUMN sort_order ENUM('id','name','rand','rating','updated','url') DEFAULT 'rand'");
+}
+    
 // The functions we use to actually do stuff
 
 // General

wp-admin/upgrade-schema.php

@@ -39 +39 @@
   show_description enum('Y','N') NOT NULL default 'N',
   show_rating enum('Y','N') NOT NULL default 'Y',
   show_updated enum('Y','N') NOT NULL default 'Y',
-  sort_order varchar(64) NOT NULL default 'rand',
+  sort_order enum('id','rand','name','url','rating','updated') default 'rand',
   sort_desc enum('Y','N') NOT NULL default 'N',
   text_before_link varchar(128) NOT NULL default '<li>',
   text_after_link varchar(128) NOT NULL default '<br />',