From 0c2ab53136fe99dbcc1b938f203ab160aa01a536 Mon Sep 17 00:00:00 2001
From: wpmuguru <wpmuguru@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Tue, 16 Mar 2010 15:31:50 +0000
Subject: [PATCH] introduce global_terms_enabled site option, see #12589

git-svn-id: http://svn.automattic.com/wordpress/trunk@13713 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/schema.php  | 4 ++++
 wp-admin/includes/upgrade.php | 3 +++
 wp-admin/ms-edit.php          | 2 +-
 wp-admin/ms-options.php       | 8 ++++++++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php
index ce0a7532a..766d259f2 100644
--- a/wp-admin/includes/schema.php
+++ b/wp-admin/includes/schema.php
@@ -709,6 +709,10 @@ Thanks!
 		'upload_space_check_disabled' => '0',
 		'subdomain_install' => intval( $subdomain_install ),
 	);
+	if ( is_multisite() )
+		$sitemeta[ 'global_terms_enabled' ] = get_site_option( 'global_terms_enabled', '0' );
+	else
+		$sitemeta[ 'global_terms_enabled' ] = '0';
 
 	$insert = '';
 	foreach ( $sitemeta as $meta_key => $meta_value ) {
diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index 28d27f5d2..1bdcd48eb 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -1149,6 +1149,9 @@ function upgrade_network() {
 			$start += 20;
 		}
 	}
+	// 3.0
+	if ( $wp_current_db_version < 13576 )
+		update_site_option( 'global_terms_enabled', '1' );
 }
 
 // The functions we use to actually do stuff
diff --git a/wp-admin/ms-edit.php b/wp-admin/ms-edit.php
index eaa18fa45..c04fe8440 100644
--- a/wp-admin/ms-edit.php
+++ b/wp-admin/ms-edit.php
@@ -107,7 +107,7 @@ switch ( $_GET['action'] ) {
 			}
 		}
 		update_site_option( "dashboard_blog", $dashboard_blog_id );
-		$options = array( 'registrationnotification', 'registration', 'add_new_users', 'menu_items', 'mu_media_buttons', 'upload_space_check_disabled', 'blog_upload_space', 'upload_filetypes', 'site_name', 'first_post', 'first_page', 'first_comment', 'first_comment_url', 'first_comment_author', 'welcome_email', 'welcome_user_email', 'fileupload_maxk', 'admin_notice_feed' );
+		$options = array( 'registrationnotification', 'registration', 'add_new_users', 'menu_items', 'mu_media_buttons', 'upload_space_check_disabled', 'blog_upload_space', 'upload_filetypes', 'site_name', 'first_post', 'first_page', 'first_comment', 'first_comment_url', 'first_comment_author', 'welcome_email', 'welcome_user_email', 'fileupload_maxk', 'admin_notice_feed', 'global_terms_enabled' );
 		$checked_options = array('mu_media_buttons', 'menu_items');
 		foreach ( $checked_options as $option_name ) {
 			if ( ! isset($_POST[ $option_name ]) )
diff --git a/wp-admin/ms-options.php b/wp-admin/ms-options.php
index e022d8f8a..d8bc18697 100644
--- a/wp-admin/ms-options.php
+++ b/wp-admin/ms-options.php
@@ -43,6 +43,14 @@ if (isset($_GET['updated'])) {
 					<?php printf( __( 'Registration and support mails will come from this address. Make it generic like "support@%s"' ), $current_site->domain ); ?>
 				</td>
 			</tr>
+
+			<tr valign="top">
+				<th scope="row"><?php _e('Global Terms') ?></th>
+				<td>
+				<label><input type='radio' id="global_terms_enabled" name="global_terms_enabled" value='1' <?php checked( get_site_option( 'global_terms_enabled' ), 1 ) ?>/> <?php _e( 'Enabled' ); ?></label><br />
+				<label><input type='radio' id="global_terms_enabled" name="global_terms_enabled" value='0' <?php checked( get_site_option( 'global_terms_enabled' ), 0 ) ?>/> <?php _e( 'Disabled' ); ?></label><br />
+				<?php _e( 'Maintain a global list of terms from all sites across the network.' ); ?></td>
+			</tr>
 		</table>
 		<h3><?php _e('Dashboard Settings'); ?></h3>
 		<table class="form-table">