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

Give network level upgrades separate API that is run when upgrading the main blog. see #11644 

git-svn-id: http://svn.automattic.com/wordpress/trunk@12931 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-02-02 21:53:26 +00:00
parent 1592ca9ff2
commit e215f4b963
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -316,14 +316,15 @@ function wp_upgrade() {
pre_schema_upgrade();
make_db_current_silent();
upgrade_all();
if ( is_multisite() && is_main_site() )
upgrade_network();
wp_cache_flush();
if ( is_multisite() ) {
if ( $wpdb->get_row( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'" ) ) {
if ( $wpdb->get_row( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'" ) )
$wpdb->query( "UPDATE {$wpdb->blog_versions} SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'" );
} else {
else
$wpdb->query( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());" );
}
}
}
endif;
@ -1061,12 +1062,35 @@ function upgrade_290() {
/**
* Execute changes made in WordPress 3.0.
*
* @since 3.0
* @since 3.0.0
*/
function upgrade_300() {
populate_roles_300();
}
/**
* Execute network level changes
*
* @since 3.0.0
*/
function upgrade_network() {
// 2.8
if ( $wp_current_db_version < 11549 ) {
$wpmu_sitewide_plugins = get_site_option( 'wpmu_sitewide_plugins' );
$active_sitewide_plugins = get_site_option( 'active_sitewide_plugins' );
if ( $wpmu_sitewide_plugins ) {
if ( !$active_sitewide_plugins )
$sitewide_plugins = (array) $wpmu_sitewide_plugins;
else
$sitewide_plugins = array_merge( (array) $active_sitewide_plugins, (array) $wpmu_sitewide_plugins );
update_site_option( 'active_sitewide_plugins', $sitewide_plugins );
}
update_site_option( 'wpmu_sitewide_plugins', '' );
update_site_option( 'deactivated_sitewide_plugins', '' );
}
}
// The functions we use to actually do stuff
// General