From b6b8a588bb30680e9d77429915796e56948ab37b Mon Sep 17 00:00:00 2001 From: ryan Date: Mon, 28 Nov 2011 20:35:36 +0000 Subject: [PATCH] Initialize active_sitewide_plugins during network install and upgrade. fixes #19385 git-svn-id: http://svn.automattic.com/wordpress/trunk@19470 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/schema.php | 1 + wp-admin/includes/upgrade.php | 4 ++++ wp-includes/version.php | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php index 53d917757..687b8fd30 100644 --- a/wp-admin/includes/schema.php +++ b/wp-admin/includes/schema.php @@ -894,6 +894,7 @@ We hope you enjoy your new site. Thanks! 'subdomain_install' => intval( $subdomain_install ), 'global_terms_enabled' => global_terms_enabled() ? '1' : '0', 'initial_db_version' => get_option( 'initial_db_version' ), + 'active_sitewide_plugins' => array(), ); if ( ! $subdomain_install ) $sitemeta['illegal_names'][] = 'blog'; diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php index e000c077d..646e1ccb5 100644 --- a/wp-admin/includes/upgrade.php +++ b/wp-admin/includes/upgrade.php @@ -1254,6 +1254,10 @@ function upgrade_network() { // 3.3 if ( $wp_current_db_version < 19390 ) update_site_option( 'initial_db_version', $wp_current_db_version ); + if ( $wp_current_db_version < 19470 ) { + if ( false === get_site_option( 'active_sitewide_plugins' ) ) + update_site_option( 'active_sitewide_plugins', array() ); + } } // The functions we use to actually do stuff diff --git a/wp-includes/version.php b/wp-includes/version.php index ff7e4b1dd..5e24bf1b3 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -11,7 +11,7 @@ $wp_version = '3.3-beta4'; * * @global int $wp_db_version */ -$wp_db_version = 19389; +$wp_db_version = 19470; /** * Holds the TinyMCE version