From 2cde17f232788bab889244ad557343d9ab46fdb5 Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Fri, 8 May 2015 11:58:22 +0000 Subject: [PATCH] When saving Writing Options, check that the UI is enabled for `use_smilies` and `use_balanceTags` before trying to update them. Fixes #5161. Fixes #32298. git-svn-id: https://develop.svn.wordpress.org/trunk@32455 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/options.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/wp-admin/options.php b/src/wp-admin/options.php index 0f149c95c5..5dacc41c44 100644 --- a/src/wp-admin/options.php +++ b/src/wp-admin/options.php @@ -76,7 +76,7 @@ $whitelist_options = array( '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' ), - 'writing' => array( 'use_smilies', 'default_category', 'default_email_category', 'use_balanceTags', 'default_link_category', 'default_post_format' ) + 'writing' => array( 'default_category', 'default_email_category', 'default_link_category', 'default_post_format' ) ); $whitelist_options['misc'] = $whitelist_options['options'] = $whitelist_options['privacy'] = array(); @@ -85,6 +85,11 @@ $mail_options = array('mailserver_url', 'mailserver_port', 'mailserver_login', ' if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) $whitelist_options['reading'][] = 'blog_charset'; +if ( get_site_option( 'initial_db_version' ) < 32453 ) { + $whitelist_options['writing'][] = 'use_smilies'; + $whitelist_options['writing'][] = 'use_balanceTags'; +} + if ( !is_multisite() ) { if ( !defined( 'WP_SITEURL' ) ) $whitelist_options['general'][] = 'siteurl';