From 2ae741bb79c2de24a5043da6e7e20cd994eed52b Mon Sep 17 00:00:00 2001 From: dd32 Date: Thu, 18 Mar 2010 07:58:53 +0000 Subject: [PATCH] Remove reminents of 'misc' from whitelist options too. See [13745] See #12437 git-svn-id: http://svn.automattic.com/wordpress/trunk@13746 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/options.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/wp-admin/options.php b/wp-admin/options.php index 6e9023a4ad..b02209c82b 100644 --- a/wp-admin/options.php +++ b/wp-admin/options.php @@ -36,7 +36,6 @@ if ( is_multisite() && !is_super_admin() && 'update' != $action ) $whitelist_options = array( 'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string' ), 'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order', 'comment_registration' ), - 'misc' => array( '' ), 'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type', 'embed_autourls', 'embed_size_w', 'embed_size_h', 'uploads_use_yearmonth_folders', 'upload_path', 'upload_url_path' ), 'privacy' => array( 'blog_public' ), 'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'blog_charset', 'show_on_front', 'page_on_front', 'page_for_posts' ), @@ -65,8 +64,6 @@ if ( !is_multisite() ) { $whitelist_options['general'][] = 'WPLANG'; $whitelist_options['general'][] = 'language'; - $whitelist_options[ 'misc' ] = array(); - if ( apply_filters( 'enable_post_by_email_configuration', true ) ) $whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);