golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Drop the blog_id column from the options table during upgrade. Props barry. fixes #17188 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19798 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2012-01-31 17:45:22 +00:00
parent ecedc9152f
commit 0f80145c67
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wp-admin/includes/upgrade.php
View File

@ -459,6 +459,9 @@ function upgrade_all() {
if ( $wp_current_db_version < 19389 )
upgrade_330();
if ( $wp_current_db_version < 19793 )
upgrade_340();
maybe_disable_automattic_widgets();
update_option( 'db_version', $wp_db_version );
@ -1213,6 +1216,19 @@ function upgrade_330() {
}
}
/**
* Execute changes made in WordPress 3.4.
*
* @since 3.4.0
*/
function upgrade_340() {
global $wp_current_db_version, $wpdb;
$wpdb->hide_errors();
$wpdb->query( "ALTER TABLE $wpdb->options DROP COLUMN blog_id" );
$wpdb->show_errors();
}
/**
* Execute network level changes
*

2
wp-includes/version.php
View File

@ -11,7 +11,7 @@ $wp_version = '3.4-alpha-19719';
*
* @global int $wp_db_version
*/
$wp_db_version = 19793;
$wp_db_version = 19798;
/**
* Holds the TinyMCE version