From c25efe2d5220ef804cbc0395c8e993ca2670854f Mon Sep 17 00:00:00 2001 From: Dominik Schilling Date: Wed, 18 Nov 2015 20:30:25 +0000 Subject: [PATCH] Revert [35336] and [35337]. See #28344. Built from https://develop.svn.wordpress.org/trunk@35685 git-svn-id: http://core.svn.wordpress.org/trunk@35649 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/options.php | 23 +---------------------- wp-admin/options-general.php | 29 +++++++++++++++++------------ wp-admin/options.php | 13 ++----------- wp-includes/locale.php | 3 --- wp-includes/version.php | 2 +- 5 files changed, 21 insertions(+), 49 deletions(-) diff --git a/wp-admin/includes/options.php b/wp-admin/includes/options.php index c5d5d31090..f0fab455ff 100644 --- a/wp-admin/includes/options.php +++ b/wp-admin/includes/options.php @@ -138,25 +138,4 @@ function options_reading_add_js() { function options_reading_blog_charset() { echo ''; echo '

' . __( 'The character encoding of your site (UTF-8 is recommended)' ) . '

'; -} - -/** - * Render the week starts on setting. - * - * @global WP_Locale $wp_locale - * - * @since 4.4.0 - */ -function options_general_start_of_week() { - global $wp_locale; - ?> - -
-start_of_week ) { - add_settings_field( 'start_of_week', __( 'Week Starts On' ), 'options_general_start_of_week', 'general', 'default', array( 'label_for' => 'start_of_week' ) ); -} -?> + @@ -293,8 +283,23 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists + + + + + array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', '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', 'medium_large_size_w', 'medium_large_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' ), @@ -92,17 +92,8 @@ $whitelist_options['misc'] = $whitelist_options['options'] = $whitelist_options[ $mail_options = array('mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass'); -if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) { +if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) $whitelist_options['reading'][] = 'blog_charset'; -} - -/** - * @global WP_Locale $wp_locale - */ -global $wp_locale; -if ( get_option( 'start_of_week' ) != $wp_locale->start_of_week ) { - $whitelist_options['general'][] = 'start_of_week'; -} if ( get_site_option( 'initial_db_version' ) < 32453 ) { $whitelist_options['writing'][] = 'use_smilies'; diff --git a/wp-includes/locale.php b/wp-includes/locale.php index 7ba005c352..040fa5563a 100644 --- a/wp-includes/locale.php +++ b/wp-includes/locale.php @@ -126,9 +126,6 @@ class WP_Locale { $this->weekday_initial[ __( 'Friday' ) ] = /* translators: one-letter abbreviation of the weekday */ _x( 'F', 'Friday initial' ); $this->weekday_initial[ __( 'Saturday' ) ] = /* translators: one-letter abbreviation of the weekday */ _x( 'S', 'Saturday initial' ); - // Start of the week. - $this->start_of_week = /* translators: default start of the week. 0 = Sunday, 1 = Monday */ _x( '1', 'start of week' ); - // Abbreviations for each day. $this->weekday_abbrev[__('Sunday')] = /* translators: three-letter abbreviation of the weekday */ __('Sun'); $this->weekday_abbrev[__('Monday')] = /* translators: three-letter abbreviation of the weekday */ __('Mon'); diff --git a/wp-includes/version.php b/wp-includes/version.php index a3bcfae3e2..b3ec5163a0 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-beta4-35684'; +$wp_version = '4.4-beta4-35685'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.