Ticket #28344: 28344.5.patch

src/wp-admin/includes/options.php

@@ -138 +138 @@
 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
+}

src/wp-admin/options-general.php

@@ -53 +53 @@
 <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>
 <th scope="row"><label for="blogname"><?php _e('Site Title') ?></label></th>
@@ -274 +284 @@
         </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();

src/wp-admin/options.php

@@ -82 +82 @@
 }
 
 $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', '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 +92 @@
 
 $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';
         $whitelist_options['writing'][] = 'use_balanceTags';

src/wp-includes/locale.php

@@ -42 +42 @@
         public $weekday_abbrev;
 
         /**
+         * Stores the default start of the week.
+         *
+         * @var string
+         */
+        public $start_of_week;
+
+        /**
          * Stores the translated strings for the full month names.
          *
          * @since 2.1.0
@@ -118 +125 @@
                 $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');