From 253646fcd1d96e4098a5b3cc24cc9c166326f097 Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Wed, 21 Oct 2015 17:39:25 +0000
Subject: [PATCH] Options: Hide the week starts on setting for installs that
 have the default setting already.

The default setting is the value of `$wp_locale->start_of_week` which holds the value per locale, see [35336].

Props swissspidy, ocean90.
Fixes #28344.
Built from https://develop.svn.wordpress.org/trunk@35337


git-svn-id: http://core.svn.wordpress.org/trunk@35303 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/options.php | 23 ++++++++++++++++++++++-
 wp-admin/options-general.php  | 29 ++++++++++++-----------------
 wp-admin/options.php          | 13 +++++++++++--
 wp-includes/version.php       |  2 +-
 4 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/wp-admin/includes/options.php b/wp-admin/includes/options.php
index f0fab455ff..c5d5d31090 100644
--- a/wp-admin/includes/options.php
+++ b/wp-admin/includes/options.php
@@ -138,4 +138,25 @@ function options_reading_add_js() {
 function options_reading_blog_charset() {
 	echo '<input name="blog_charset" type="text" id="blog_charset" value="' . esc_attr( get_option( 'blog_charset' ) ) . '" class="regular-text" />';
 	echo '<p class="description">' . __( 'The <a href="https://codex.wordpress.org/Glossary#Character_set">character encoding</a> of your site (UTF-8 is recommended)' ) . '</p>';
-}
\ No newline at end of file
+}
+
+/**
+ * Render the week starts on setting.
+ *
+ * @global WP_Locale $wp_locale
+ *
+ * @since 4.4.0
+ */
+function options_general_start_of_week() {
+	global $wp_locale;
+	?>
+	<select name="start_of_week" id="start_of_week">
+		<?php
+		$start_of_week = get_option( 'start_of_week' );
+		for ( $day_index = 0; $day_index <= 6; $day_index++ ) {
+			echo "\n\t<option value='" . esc_attr( $day_index ) . "'" . selected( $start_of_week, $day_index, false ) . ">" . $wp_locale->get_weekday( $day_index ) . '</option>';
+		}
+		?>
+	</select>
+	<?php
+}
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index 662184a829..8c8409090d 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -53,7 +53,17 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 <h1><?php echo esc_html( $title ); ?></h1>
 
 <form method="post" action="options.php" novalidate="novalidate">
-<?php settings_fields('general'); ?>
+<?php
+settings_fields( 'general' );
+
+/**
+ * @global WP_Locale $wp_locale
+ */
+global $wp_locale;
+if ( get_option( 'start_of_week' ) != $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' ) );
+}
+?>
 
 <table class="form-table">
 <tr>
@@ -274,23 +284,8 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
 	</fieldset>
 </td>
 </tr>
-<tr>
-<th scope="row"><label for="start_of_week"><?php _e('Week Starts On') ?></label></th>
-<td><select name="start_of_week" id="start_of_week">
-<?php
-/**
- * @global WP_Locale $wp_locale
- */
-global $wp_locale;
 
-for ($day_index = 0; $day_index <= 6; $day_index++) :
-	$selected = (get_option('start_of_week') == $day_index) ? 'selected="selected"' : '';
-	echo "\n\t<option value='" . esc_attr($day_index) . "' $selected>" . $wp_locale->get_weekday($day_index) . '</option>';
-endfor;
-?>
-</select></td>
-</tr>
-<?php do_settings_fields('general', 'default'); ?>
+<?php do_settings_fields( 'general', 'default' ); ?>
 
 <?php
 $languages = get_available_languages();
diff --git a/wp-admin/options.php b/wp-admin/options.php
index 6bad0fd61f..ade59cbbb2 100644
--- a/wp-admin/options.php
+++ b/wp-admin/options.php
@@ -82,7 +82,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' ),
+	'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', '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' ),
@@ -92,8 +92,17 @@ $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/version.php b/wp-includes/version.php
index 952bfb197b..507c98def5 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-35336';
+$wp_version = '4.4-alpha-35337';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.