WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
nacin 2010-05-25 13:58:52 +00:00
parent ff31cebbfd
commit ba599a19e3
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-admin/ms-edit.php
View File

@ -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 ) {