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

Move multisite-specific upgrade code from upgrade_330() to upgrade_network(). see #18693. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19469 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2011-11-28 20:04:00 +00:00
parent f9ee8ccfd2
commit 28276e825c
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1156,12 +1156,6 @@ function upgrade_330() {
&& is_main_site() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) )
delete_metadata( 'user', 0, 'dismissed_wp_pointers', '', true );
if ( $wp_current_db_version < 19390 && is_main_site() ) {
update_site_option( 'initial_db_version', $wp_current_db_version );
// populate_options() will handle single-site.
}
if ( $wp_current_db_version >= 11548 )
return;
@ -1257,6 +1251,9 @@ function upgrade_network() {
// 3.0
if ( $wp_current_db_version < 13576 )
update_site_option( 'global_terms_enabled', '1' );
// 3.3
if ( $wp_current_db_version < 19390 )
update_site_option( 'initial_db_version', $wp_current_db_version );
}
// The functions we use to actually do stuff