Site icon: Remove option name from `$whitelist_options` for the general options screen.

The option gets saved in `WP_Site_Icon->set_site_icon()`.

fixes #32859.
Built from https://develop.svn.wordpress.org/trunk@33037


git-svn-id: http://core.svn.wordpress.org/trunk@33008 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/options.php

@@ -72,7 +72,7 @@ if ( is_multisite() && !is_super_admin() && 'update' != $action )
 	wp_die( __( 'Cheatin’ uh?' ), 403 );
 
 $whitelist_options = array(
-	'general' => array( 'blogname', 'blogdescription', 'site_icon', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string', 'WPLANG' ),
+	'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string', 'WPLANG' ),
 	'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' ),
 	'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' ),
 	'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'show_on_front', 'page_on_front', 'page_for_posts', 'blog_public' ),

wp-includes/version.php

@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-alpha-33036';
+$wp_version = '4.3-alpha-33037';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.