WordPress.org

Make WordPress Core

Changeset 35685


Ignore:
Timestamp:
11/18/2015 08:29:44 PM (6 years ago)
Author:
ocean90
Message:

Revert [35336] and [35337].

See #28344.

Location:
trunk/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/includes/options.php

    r35337 r35685  
    140140    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>';
    141141}
    142 
    143 /**
    144  * Render the week starts on setting.
    145  *
    146  * @global WP_Locale $wp_locale
    147  *
    148  * @since 4.4.0
    149  */
    150 function options_general_start_of_week() {
    151     global $wp_locale;
    152     ?>
    153     <select name="start_of_week" id="start_of_week">
    154         <?php
    155         $start_of_week = get_option( 'start_of_week' );
    156         for ( $day_index = 0; $day_index <= 6; $day_index++ ) {
    157             echo "\n\t<option value='" . esc_attr( $day_index ) . "'" . selected( $start_of_week, $day_index, false ) . ">" . $wp_locale->get_weekday( $day_index ) . '</option>';
    158         }
    159         ?>
    160     </select>
    161     <?php
    162 }
  • trunk/src/wp-admin/options-general.php

    r35438 r35685  
    5454
    5555<form method="post" action="options.php" novalidate="novalidate">
    56 <?php
    57 settings_fields( 'general' );
    58 
    59 /**
    60  * @global WP_Locale $wp_locale
    61  */
    62 global $wp_locale;
    63 if ( get_option( 'start_of_week' ) != $wp_locale->start_of_week ) {
    64     add_settings_field( 'start_of_week', __( 'Week Starts On' ), 'options_general_start_of_week', 'general', 'default', array( 'label_for' => 'start_of_week' ) );
    65 }
    66 ?>
     56<?php settings_fields('general'); ?>
    6757
    6858<table class="form-table">
     
    294284</td>
    295285</tr>
    296 
    297 <?php do_settings_fields( 'general', 'default' ); ?>
     286<tr>
     287<th scope="row"><label for="start_of_week"><?php _e('Week Starts On') ?></label></th>
     288<td><select name="start_of_week" id="start_of_week">
     289<?php
     290/**
     291 * @global WP_Locale $wp_locale
     292 */
     293global $wp_locale;
     294
     295for ($day_index = 0; $day_index <= 6; $day_index++) :
     296    $selected = (get_option('start_of_week') == $day_index) ? 'selected="selected"' : '';
     297    echo "\n\t<option value='" . esc_attr($day_index) . "' $selected>" . $wp_locale->get_weekday($day_index) . '</option>';
     298endfor;
     299?>
     300</select></td>
     301</tr>
     302<?php do_settings_fields('general', 'default'); ?>
    298303
    299304<?php
  • trunk/src/wp-admin/options.php

    r35479 r35685  
    8383
    8484$whitelist_options = array(
    85     'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'timezone_string', 'WPLANG' ),
     85    'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string', 'WPLANG' ),
    8686    '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' ),
    8787    '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' ),
     
    9393$mail_options = array('mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass');
    9494
    95 if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) {
     95if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) )
    9696    $whitelist_options['reading'][] = 'blog_charset';
    97 }
    98 
    99 /**
    100  * @global WP_Locale $wp_locale
    101  */
    102 global $wp_locale;
    103 if ( get_option( 'start_of_week' ) != $wp_locale->start_of_week ) {
    104     $whitelist_options['general'][] = 'start_of_week';
    105 }
    10697
    10798if ( get_site_option( 'initial_db_version' ) < 32453 ) {
  • trunk/src/wp-includes/locale.php

    r35522 r35685  
    126126        $this->weekday_initial[ __( 'Friday' ) ]    = /* translators: one-letter abbreviation of the weekday */ _x( 'F', 'Friday initial' );
    127127        $this->weekday_initial[ __( 'Saturday' ) ]  = /* translators: one-letter abbreviation of the weekday */ _x( 'S', 'Saturday initial' );
    128 
    129         // Start of the week.
    130         $this->start_of_week = /* translators: default start of the week. 0 = Sunday, 1 = Monday */ _x( '1', 'start of week' );
    131128
    132129        // Abbreviations for each day.
Note: See TracChangeset for help on using the changeset viewer.