Changeset 13796 for trunk/wp-admin/ms-edit.php

Timestamp:

03/22/2010 06:02:04 AM (16 years ago)

Author:

nacin

Message:

More ms-options cleanup. Add label elements, and transition to checkboxes from radios where we can. Also fix notice in global_terms_enabled post handling.

File:

• trunk/wp-admin/ms-edit.php (modified) (2 diffs)

trunk/wp-admin/ms-edit.php

@@ -109 +109 @@
         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
@@ -115 +115 @@
         }
         $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 ) {