From 28276e825c5572af4b490204546a1deafab5ca36 Mon Sep 17 00:00:00 2001 From: nacin Date: Mon, 28 Nov 2011 20:04:00 +0000 Subject: [PATCH] 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 --- wp-admin/includes/upgrade.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php index deb829c7b0..e000c077d9 100644 --- a/wp-admin/includes/upgrade.php +++ b/wp-admin/includes/upgrade.php @@ -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