diff --git a/wp-admin/upgrade-071-to-072.php b/wp-admin/upgrade-071-to-072.php index 4c268d9abe..cd7b87d8e5 100644 --- a/wp-admin/upgrade-071-to-072.php +++ b/wp-admin/upgrade-071-to-072.php @@ -80,6 +80,8 @@ switch($step) { $query = " CREATE TABLE $tableoptions ( option_id int(11) NOT NULL auto_increment, + blog_id int(11) not null default 0, + option_can_override enum ('Y','N') NOT NULL default 'Y', option_name varchar(64) UNIQUE NOT NULL default '', option_type int(11) NOT NULL default 1, option_value varchar(255) NOT NULL default '', @@ -87,7 +89,7 @@ CREATE TABLE $tableoptions ( option_height int NOT NULL default 8, option_description tinytext NOT NULL default '', option_admin_level int NOT NULL DEFAULT '1', - PRIMARY KEY (option_id) + PRIMARY KEY (option_id, blog_id) ) "; $q = $wpdb->query($query); @@ -417,7 +419,7 @@ foreach ($option_data as $query) { ?>

OK. All settings transferred.

Congratulations! You have updated to the latest version of WordPress

-

You can now delete your b2config.php file

+

You can now delete your b2config.php file, and go play with your updated blog