From ba599a19e355a6b925236118e936246965a052f6 Mon Sep 17 00:00:00 2001 From: nacin Date: Tue, 25 May 2010 13:58:52 +0000 Subject: [PATCH] Remove the on switch for global terms. install_global_terms() can be triggered in a plugin. see #12666. git-svn-id: http://svn.automattic.com/wordpress/trunk@14880 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/ms-edit.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/wp-admin/ms-edit.php b/wp-admin/ms-edit.php index c2ad77937..8307bf851 100644 --- a/wp-admin/ms-edit.php +++ b/wp-admin/ms-edit.php @@ -115,12 +115,7 @@ switch ( $_GET['action'] ) { } } update_site_option( 'dashboard_blog', $dashboard_blog_id ); - // global terms - if ( !global_terms_enabled() && ! empty( $_POST['global_terms_enabled'] ) ) { - require_once( ABSPATH . 'wp-admin/includes/upgrade.php' ); - // create global terms table - install_global_terms(); - } + $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' => array(), 'menu_items' => array(), 'registrationnotification' => 'no', 'upload_space_check_disabled' => 1 ); foreach ( $checked_options as $option_name => $option_unchecked_value ) {