Ticket #12832: 12832.diff

src/wp-admin/includes/upgrade.php

@@ -1978 +1978 @@
                 $wpdb->query("ALTER TABLE $wpdb->options DROP INDEX option_name");
         }
 
-        // Upgrade verions prior to 3.7
-        if ( $wp_current_db_version < 25179 && is_multisite() && is_main_network() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
-                $wpdb->query( "ALTER TABLE $wpdb->signups ADD signup_id BIGINT(20) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST" );
-                $wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain" );
+        if ( $wp_current_db_version < 30000 && is_multisite() && is_main_network() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
+                // Upgrade verions prior to 3.7
+                if ( $wp_current_db_version < 25179 ) {
+                        $wpdb->query( "ALTER TABLE $wpdb->signups ADD signup_id BIGINT(20) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST" );
+                        $wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain" );
+                }
+
+                if ( $wp_current_db_version < 30000 ) {
+                        $wpdb->query( "ALTER TABLE $wpdb->blogs CHANGE COLUMN archived archived varchar(1) NOT NULL default '0'" );
+                        $wpdb->query( "ALTER TABLE $wpdb->blogs CHANGE COLUMN archived archived tinyint(2) NOT NULL default 0" );
+                }
         }
 }
 

src/wp-admin/includes/schema.php

@@ -230 +230 @@
   registered datetime NOT NULL default '0000-00-00 00:00:00',
   last_updated datetime NOT NULL default '0000-00-00 00:00:00',
   public tinyint(2) NOT NULL default '1',
-  archived enum('0','1') NOT NULL default '0',
+  archived tinyint(2) NOT NULL default '0',
   mature tinyint(2) NOT NULL default '0',
   spam tinyint(2) NOT NULL default '0',
   deleted tinyint(2) NOT NULL default '0',