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

@@ -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';

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

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