From bdfd58c8cfcdc72bb6d754804fbca9ede55eed17 Mon Sep 17 00:00:00 2001 From: Joe McGill Date: Sun, 15 May 2016 22:38:29 +0000 Subject: [PATCH] Media: Remove medium_large size from `$whitelist_options['media']` in `options.php`. The `medium_large_size_w` and `medium_large_size_h` options were added to the $whitelist_options['media'] in options.php in [35479], which causes both options to be set to `0` when the media settings are changed. When this occurs, the medium_large image size will no longer be created when an image is uploaded. Since these options aren't meant to be updated via the settings UI, they can be safely removed from the whitelist. Fixes #36531. Built from https://develop.svn.wordpress.org/trunk@37435 git-svn-id: http://core.svn.wordpress.org/trunk@37401 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/options.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-admin/options.php b/wp-admin/options.php index e2bfa90f34..6bad0fd61f 100644 --- a/wp-admin/options.php +++ b/wp-admin/options.php @@ -84,7 +84,7 @@ 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', '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', 'medium_large_size_w', 'medium_large_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type' ), + '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' ), 'writing' => array( 'default_category', 'default_email_category', 'default_link_category', 'default_post_format' ) ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 5b894f9d8e..d9b69e9341 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.6-alpha-37434'; +$wp_version = '4.6-alpha-37435'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.