diff --git a/wp-admin/ms-edit.php b/wp-admin/ms-edit.php index df31ce3bf9..30077e4d45 100644 --- a/wp-admin/ms-edit.php +++ b/wp-admin/ms-edit.php @@ -108,16 +108,16 @@ switch ( $_GET['action'] ) { } update_site_option( "dashboard_blog", $dashboard_blog_id ); // global terms - if ( !global_terms_enabled() && '1' == $_POST[ 'global_terms_enabled' ] ) { + 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', 'menu_items'); - foreach ( $checked_options as $option_name ) { + $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 ) { if ( ! isset($_POST[ $option_name ]) ) - $_POST[ $option_name ] = array(); + $_POST[ $option_name ] = $option_unchecked_value; } foreach ( $options as $option_name ) { if ( ! isset($_POST[ $option_name ]) ) diff --git a/wp-admin/ms-options.php b/wp-admin/ms-options.php index 73cbdbb705..29c36e6e78 100644 --- a/wp-admin/ms-options.php +++ b/wp-admin/ms-options.php @@ -27,7 +27,7 @@ if (isset($_GET['updated'])) {
+ |
@@ -36,26 +36,25 @@ if (isset($_GET['updated'])) { | |
---|---|---|
+ |
- domain ); ?> + support@%s is recommended.' ), $current_site->domain ); ?> |
|
- - - |
+