Ticket #39441: 39441.implementation.diff

src/wp-admin/includes/options.php

@@ -51 +51 @@
 
                 $("input[name='date_format']").click(function(){
                         if ( "date_format_custom_radio" != $(this).attr("id") )
-                                $( "input[name='date_format_custom']" ).val( $( this ).val() ).siblings( '.example' ).text( $( this ).parent( 'label' ).children( '.format-i18n' ).text() );
+                                $( "input[name='date_format_custom']" ).val( $( this ).val() ).parent().find( '.example' ).text( $( this ).parent().find( '.format-i18n' ).text() );
                 });
                 $("input[name='date_format_custom']").focus(function(){
                         $( '#date_format_custom_radio' ).prop( 'checked', true );
@@ -59 +59 @@
 
                 $("input[name='time_format']").click(function(){
                         if ( "time_format_custom_radio" != $(this).attr("id") )
-                                $( "input[name='time_format_custom']" ).val( $( this ).val() ).siblings( '.example' ).text( $( this ).parent( 'label' ).children( '.format-i18n' ).text() );
+                                $( "input[name='time_format_custom']" ).val( $( this ).val() ).parent().find( '.example' ).text( $( this ).parent().find( '.format-i18n' ).text() );
                 });
                 $("input[name='time_format_custom']").focus(function(){
                         $( '#time_format_custom_radio' ).prop( 'checked', true );

src/wp-admin/options-general.php

@@ -6 +6 @@
  * @subpackage Administration
  */
 
+function roles_dropdown( $field_args ) {
+        $input_attrs = array(
+                'id'    => ! empty( $field_args['input_id'] ) ? $field_args['input_id'] : '',
+                'name'  => ! empty( $field_args['input_name'] ) ? $field_args['input_name'] : '',
+                'class' => ! empty( $field_args['input_class'] ) ? $field_args['input_class'] : '',
+        );
+
+        $description_attrs = array();
+
+        if ( ! empty( $field_args['description'] ) ) {
+                if ( ! empty( $field_args['description_id'] ) ) {
+                        $description_attrs['id'] = $field_args['description_id'];
+                        $input_attrs['aria-describedby'] = $field_args['description_id'];
+                }
+                $description_attrs['class'] = 'description';
+        }
+
+        $current = ! empty( $field_args['value'] ) ? $field_args['value'] : '';
+        ?>
+        <select<?php attrs( $input_attrs ); ?>><?php wp_dropdown_roles( $current ); ?></select>
+        <?php
+
+        if ( ! empty( $field_args['description'] ) ) {
+                echo '<p' . attrs( $description_attrs, false ) . '>' . $field_args['description'] . '</p>';
+        }
+}
+
+function languages_dropdown( $field_args ) {
+        $languages    = isset( $field_args['languages'] ) ? $field_args['languages'] : get_available_languages();
+        $translations = isset( $field_args['translations'] ) ? $field_args['translations'] : wp_get_available_translations();
+
+        $locale = get_locale();
+        if ( ! in_array( $locale, $languages ) ) {
+                $locale = '';
+        }
+
+        wp_dropdown_languages( array(
+                'name'         => ! empty( $field_args['input_name'] ) ? $field_args['input_name'] : '',
+                'id'           => ! empty( $field_args['input_id'] ) ? $field_args['input_id'] : '',
+                'selected'     => $locale,
+                'languages'    => $languages,
+                'translations' => $translations,
+                'show_available_translations' => ( ! is_multisite() || is_super_admin() ) && wp_can_install_language_pack(),
+        ) );
+}
+
+function timezones_dropdown( $field_args ) {
+        $current_offset = get_option('gmt_offset');
+        $tzstring = ! empty( $field_args['value'] ) ? $field_args['value'] : '';
+
+        $check_zone_info = true;
+
+        // Remove old Etc mappings. Fallback to gmt_offset.
+        if ( false !== strpos($tzstring,'Etc/GMT') )
+                $tzstring = '';
+
+        if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
+                $check_zone_info = false;
+                if ( 0 == $current_offset )
+                        $tzstring = 'UTC+0';
+                elseif ($current_offset < 0)
+                        $tzstring = 'UTC' . $current_offset;
+                else
+                        $tzstring = 'UTC+' . $current_offset;
+        }
+
+        $input_attrs = array(
+                'id'    => ! empty( $field_args['input_id'] ) ? $field_args['input_id'] : '',
+                'name'  => ! empty( $field_args['input_name'] ) ? $field_args['input_name'] : '',
+                'class' => ! empty( $field_args['input_class'] ) ? $field_args['input_class'] : '',
+        );
+
+        $description_attrs = array();
+
+        if ( ! empty( $field_args['description'] ) ) {
+                if ( ! empty( $field_args['description_id'] ) ) {
+                        $description_attrs['id'] = $field_args['description_id'];
+                        $input_attrs['aria-describedby'] = $field_args['description_id'];
+                }
+                $description_attrs['class'] = 'description';
+        }
+
+        ?>
+        <select<?php attrs( $input_attrs ); ?>><?php echo wp_timezone_choice( $tzstring, get_user_locale() ); ?></select>
+        <?php
+
+        if ( ! empty( $field_args['description'] ) ) {
+                echo '<p' . attrs( $description_attrs, false ) . '>' . $field_args['description'] . '</p>';
+        }
+
+        $timezone_format = _x( 'Y-m-d H:i:s', 'timezone date format' );
+
+        ?>
+        <p class="timezone-info">
+                <span id="utc-time"><?php
+                        /* translators: 1: UTC abbreviation, 2: UTC time */
+                        printf( __( 'Universal time (%1$s) is %2$s.' ),
+                                '<abbr>' . __( 'UTC' ) . '</abbr>',
+                                '<code>' . date_i18n( $timezone_format, false, true ) . '</code>'
+                        );
+                ?></span>
+        <?php if ( get_option( 'timezone_string' ) || ! empty( $current_offset ) ) : ?>
+                <span id="local-time"><?php
+                        /* translators: %s: local time */
+                        printf( __( 'Local time is %s.' ),
+                                '<code>' . date_i18n( $timezone_format ) . '</code>'
+                        );
+                ?></span>
+        <?php endif; ?>
+        </p>
+
+        <?php if ( $check_zone_info && $tzstring ) : ?>
+        <p class="timezone-info">
+        <span>
+                <?php
+                // Set TZ so localtime works.
+                date_default_timezone_set($tzstring);
+                $now = localtime(time(), true);
+                if ( $now['tm_isdst'] )
+                        _e('This timezone is currently in daylight saving time.');
+                else
+                        _e('This timezone is currently in standard time.');
+                ?>
+                <br />
+                <?php
+                $allowed_zones = timezone_identifiers_list();
+
+                if ( in_array( $tzstring, $allowed_zones) ) {
+                        $found = false;
+                        $date_time_zone_selected = new DateTimeZone($tzstring);
+                        $tz_offset = timezone_offset_get($date_time_zone_selected, date_create());
+                        $right_now = time();
+                        foreach ( timezone_transitions_get($date_time_zone_selected) as $tr) {
+                                if ( $tr['ts'] > $right_now ) {
+                                    $found = true;
+                                        break;
+                                }
+                        }
+
+                        if ( $found ) {
+                                echo ' ';
+                                $message = $tr['isdst'] ?
+                                        /* translators: %s: date and time  */
+                                        __( 'Daylight saving time begins on: %s.')  :
+                                        /* translators: %s: date and time  */
+                                        __( 'Standard time begins on: %s.' );
+                                // Add the difference between the current offset and the new offset to ts to get the correct transition time from date_i18n().
+                                printf( $message,
+                                        '<code>' . date_i18n(
+                                                __( 'F j, Y' ) . ' ' . __( 'g:i a' ),
+                                                $tr['ts'] + ( $tz_offset - $tr['offset'] )
+                                        ) . '</code>'
+                                );
+                        } else {
+                                _e( 'This timezone does not observe daylight saving time.' );
+                        }
+                }
+                // Set back to UTC.
+                date_default_timezone_set('UTC');
+                ?>
+                </span>
+        </p>
+        <?php endif;
+}
+
+function datetime_format_radio( $field_args ) {
+        $input_attrs = array(
+                'type'  => 'radio',
+                'id'    => ! empty( $field_args['input_id'] ) ? $field_args['input_id'] : '',
+                'name'  => ! empty( $field_args['input_name'] ) ? $field_args['input_name'] : '',
+                'class' => ! empty( $field_args['input_class'] ) ? $field_args['input_class'] : '',
+        );
+
+        $choices = array();
+        $custom_radio_label = '';
+        $custom_label = '';
+
+        if ( ! empty( $field_args['mode'] ) && 'time_format' === $field_args['mode'] ) {
+                /**
+                 * Filters the default time formats.
+                 *
+                 * @since 2.7.0
+                 *
+                 * @param array $default_time_formats Array of default time formats.
+                 */
+                $choices = array_unique( apply_filters( 'time_formats', array( __( 'g:i a' ), 'g:i A', 'H:i' ) ) );
+
+                $custom_radio_label = __( 'Custom: enter a custom time format in the field below' );
+                $custom_label = __( 'Custom time format:' );
+        } else {
+                /**
+                 * Filters the default date formats.
+                 *
+                 * @since 2.7.0
+                 * @since 4.0.0 Added ISO date standard YYYY-MM-DD format.
+                 *
+                 * @param array $default_date_formats Array of default date formats.
+                 */
+                $choices = array_unique( apply_filters( 'date_formats', array( __( 'F j, Y' ), 'Y-m-d', 'm/d/Y', 'd/m/Y' ) ) );
+
+                $custom_radio_label = __( 'Custom: enter a custom date format in the field below' );
+                $custom_label = __( 'Custom date format:' );
+        }
+
+        $current = ! empty( $field_args['value'] ) ? $field_args['value'] : $choices[0];
+
+        $custom = false;
+        if ( ! in_array( $current, $choices ) ) {
+                $custom = true;
+        }
+
+        $id_suffix = 0;
+        foreach ( $choices as $value ) {
+                $id_suffix++;
+
+                $radio_attrs = $input_attrs;
+                $radio_attrs['id'] .= '-' . zeroise( $id_suffix, 2 );
+                $radio_attrs['value'] = $value;
+
+                echo '<span class="radio-item">';
+                echo '<input' . attrs( $radio_attrs, false ) . checked( $current, $value, false ) . ' />';
+                echo ' <label for="' . $radio_attrs['id'] . '"><span class="date-time-text format-i18n">' . date_i18n( $value ) . '</span><code>' . esc_html( $value ) . '</code></label>';
+                echo '</span><br />';
+        }
+
+        $radio_attrs = $input_attrs;
+        $radio_attrs['id'] = $radio_attrs['name'] . '_custom_radio';
+        $radio_attrs['value'] = '\c\u\s\t\o\m';
+
+        echo '<span class="radio-item">';
+        echo '<input' . attrs( $radio_attrs, false ) . checked( $custom, true, false ) . ' />';
+        echo ' <label for="' . $radio_attrs['id'] . '">' . $custom_radio_label . '</label>';
+        echo '</span><br />';
+
+        $description_id = $radio_attrs['id'] . '-custom-description';
+        $text_attrs = array(
+                'type'             => 'text',
+                'id'               => $radio_attrs['name'] . '_custom',
+                'name'             => $radio_attrs['name'] . '_custom',
+                'class'            => 'small-text',
+                'value'            => $current,
+                'aria-describedby' => $description_id,
+        );
+
+        echo '<span class="radio-item">';
+        echo '<label for="' . esc_attr( $text_attrs['id'] ) . '">' . $custom_label . '</label>';
+        echo ' <input' . attrs( $text_attrs, false ) . ' />';
+        echo ' <span class="description" id="' . $description_id . '">' . __( 'Example:' ) . ' <span class="example">' . date_i18n( $current ) . '</span><span class="spinner"></span></span>';
+        echo '</span>';
+}
+
+function add_settings_fields_options_general() {
+        add_settings_field( 'blogname', __( 'Site Title' ), 'text', 'general', 'default', array(
+                'input_class' => 'regular-text',
+        ) );
+
+        add_settings_field( 'blogdescription', __( 'Tagline' ), 'text', 'general', 'default', array(
+                'input_class'    => 'regular-text',
+                'description_id' => 'tagline-description',
+                'description'    => __( 'In a few words, explain what this site is about.' ),
+        ) );
+
+        if ( ! is_multisite() ) {
+                add_settings_field( 'siteurl', __( 'WordPress Address (URL)' ), 'url', 'general', 'default', array(
+                        'input_class' => 'regular-text code' . ( defined( 'WP_SITEURL' ) ? ' disabled' : '' ),
+                        'disabled'    => defined( 'WP_SITEURL' ) ? true : false,
+                ) );
+
+                add_settings_field( 'home', __( 'Site Address (URL)' ), 'url', 'general', 'default', array(
+                        'input_class' => 'regular-text code' . ( defined( 'WP_HOME' ) ? ' disabled' : '' ),
+                        'disabled'    => defined( 'WP_HOME' ) ? true : false,
+                        'description' => __( 'Enter the address here if you <a href="https://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">want your site home page to be different from your WordPress installation directory.</a>' ),
+                ) );
+
+                add_settings_field( 'admin_email', __( 'Email Address' ), 'email', 'general', 'default', array(
+                        'input_id'    => 'admin-email',
+                        'input_class' => 'regular-text ltr',
+                        'description' => __( 'This address is used for admin purposes, like new user notification.' ),
+                ) );
+
+                add_settings_field( 'users_can_register', __( 'Membership' ), 'checkbox', 'general', 'default', array(
+                        'label' => __( 'Anyone can register' ),
+                ) );
+
+                add_settings_field( 'default_role', __( 'New User Default Role' ), 'roles_dropdown', 'general', 'default' );
+        } else {
+                add_settings_field( 'admin_email', __( 'Email Address' ), 'email', 'general', 'default', array(
+                        'input_id'       => 'new_admin_email',
+                        'input_name'     => 'new_admin_email',
+                        'input_class'    => 'regular-text ltr',
+                        'description_id' => 'new-admin-email-description',
+                        'description'    => __( 'This address is used for admin purposes. If you change this we will send you an email at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ),
+                        'value_callback' => function() {
+                                return get_option( 'admin_email' );
+                        },
+                        'after'          => function() {
+                                $new_admin_email = get_option( 'new_admin_email' );
+                                if ( $new_admin_email && $new_admin_email != get_option('admin_email') ) : ?>
+                                <div class="updated inline">
+                                <p><?php
+                                        printf(
+                                                /* translators: %s: new admin email */
+                                                __( 'There is a pending change of the admin email to %s.' ),
+                                                '<code>' . esc_html( $new_admin_email ) . '</code>'
+                                        );
+                                        printf(
+                                                ' <a href="%1$s">%2$s</a>',
+                                                esc_url( wp_nonce_url( admin_url( 'options.php?dismiss=new_admin_email' ), 'dismiss-' . get_current_blog_id() . '-new_admin_email' ) ),
+                                                __( 'Cancel' )
+                                        );
+                                ?></p>
+                                </div>
+                                <?php endif;
+                        },
+                ) );
+        }
+
+        $languages = get_available_languages();
+        $translations = wp_get_available_translations();
+        if ( ! is_multisite() && defined( 'WPLANG' ) && '' !== WPLANG && 'en_US' !== WPLANG && ! in_array( WPLANG, $languages ) ) {
+                $languages[] = WPLANG;
+        }
+        if ( ! empty( $languages ) || ! empty( $translations ) ) {
+                add_settings_field( 'WPLANG', __( 'Site Language' ), 'languages_dropdown', 'general', 'default', array(
+                        'languages'    => $languages,
+                        'translations' => $translations,
+                        'after'        => function() {
+                                // Add note about deprecated WPLANG constant.
+                                if ( defined( 'WPLANG' ) && ( '' !== WPLANG ) && $locale !== WPLANG ) {
+                                        if ( is_multisite() && current_user_can( 'manage_network_options' )
+                                                || ! is_multisite() && current_user_can( 'manage_options' ) ) {
+                                                ?>
+                                                <p class="description">
+                                                        <strong><?php _e( 'Note:' ); ?></strong> <?php printf( __( 'The %s constant in your %s file is no longer needed.' ), '<code>WPLANG</code>', '<code>wp-config.php</code>' ); ?>
+                                                </p>
+                                                <?php
+                                        }
+                                        _deprecated_argument( 'define()', '4.0.0', sprintf( __( 'The %s constant in your %s file is no longer needed.' ), 'WPLANG', 'wp-config.php' ) );
+                                }
+                        },
+                ) );
+        }
+
+        add_settings_field( 'timezone_string', __( 'Timezone' ), 'timezones_dropdown', 'general', 'default', array(
+                'description_id' => 'timezone-description',
+                'description'    => __( 'Choose either a city in the same timezone as you or a UTC timezone offset.' ),
+        ) );
+
+        add_settings_field( 'date_format', __( 'Date Format' ), 'datetime_format_radio', 'general', 'default', array(
+                'mode' => 'date_format',
+        ) );
+
+        add_settings_field( 'time_format', __( 'Time Format' ), 'datetime_format_radio', 'general', 'default', array(
+                'mode'  => 'time_format',
+                'after' => function() {
+                        ?>
+                        <p class="date-time-doc"><a href="https://codex.wordpress.org/Formatting_Date_and_Time"><?php _e( 'Documentation on date and time formatting' ); ?></a>.</p>
+                        <?php
+                },
+        ) );
+
+        /**
+         * @global WP_Locale $wp_locale
+         */
+        global $wp_locale;
+
+        $start_of_week_choices = array();
+        for ( $day_index = 0; $day_index <= 6; $day_index++ ) {
+                $start_of_week_choices[ $day_index ] = $wp_locale->get_weekday( $day_index );
+        }
+
+        add_settings_field( 'start_of_week', __( 'Week Starts On' ), 'select', 'general', 'default', array(
+                'choices'        => $start_of_week_choices,
+        ) );
+}
+
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
@@ -12 +388 @@
 /** WordPress Translation Install API */
 require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
 
+add_settings_fields_options_general();
+
 if ( ! current_user_can( 'manage_options' ) )
         wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
 
@@ -55 +433 @@
 <form method="post" action="options.php" novalidate="novalidate">
 <?php settings_fields('general'); ?>
 
-<table class="form-table">
-<tr>
-<th scope="row"><label for="blogname"><?php _e('Site Title') ?></label></th>
-<td><input name="blogname" type="text" id="blogname" value="<?php form_option('blogname'); ?>" class="regular-text" /></td>
-</tr>
-<tr>
-<th scope="row"><label for="blogdescription"><?php _e('Tagline') ?></label></th>
-<td><input name="blogdescription" type="text" id="blogdescription" aria-describedby="tagline-description" value="<?php form_option('blogdescription'); ?>" class="regular-text" />
-<p class="description" id="tagline-description"><?php _e( 'In a few words, explain what this site is about.' ) ?></p></td>
-</tr>
-<?php if ( !is_multisite() ) { ?>
-<tr>
-<th scope="row"><label for="siteurl"><?php _e('WordPress Address (URL)') ?></label></th>
-<td><input name="siteurl" type="url" id="siteurl" value="<?php form_option( 'siteurl' ); ?>"<?php disabled( defined( 'WP_SITEURL' ) ); ?> class="regular-text code<?php if ( defined( 'WP_SITEURL' ) ) echo ' disabled' ?>" /></td>
-</tr>
-<tr>
-<th scope="row"><label for="home"><?php _e('Site Address (URL)') ?></label></th>
-<td><input name="home" type="url" id="home" aria-describedby="home-description" value="<?php form_option( 'home' ); ?>"<?php disabled( defined( 'WP_HOME' ) ); ?> class="regular-text code<?php if ( defined( 'WP_HOME' ) ) echo ' disabled' ?>" />
-<?php if ( ! defined( 'WP_HOME' ) ) : ?>
-<p class="description" id="home-description"><?php _e( 'Enter the address here if you <a href="https://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">want your site home page to be different from your WordPress installation directory.</a>' ); ?></p></td>
-<?php endif; ?>
-</tr>
-<tr>
-<th scope="row"><label for="admin_email"><?php _e('Email Address') ?> </label></th>
-<td><input name="admin_email" type="email" id="admin_email" aria-describedby="admin-email-description" value="<?php form_option( 'admin_email' ); ?>" class="regular-text ltr" />
-<p class="description" id="admin-email-description"><?php _e( 'This address is used for admin purposes, like new user notification.' ) ?></p></td>
-</tr>
-<tr>
-<th scope="row"><?php _e('Membership') ?></th>
-<td> <fieldset><legend class="screen-reader-text"><span><?php _e('Membership') ?></span></legend><label for="users_can_register">
-<input name="users_can_register" type="checkbox" id="users_can_register" value="1" <?php checked('1', get_option('users_can_register')); ?> />
-<?php _e('Anyone can register') ?></label>
-</fieldset></td>
-</tr>
-<tr>
-<th scope="row"><label for="default_role"><?php _e('New User Default Role') ?></label></th>
-<td>
-<select name="default_role" id="default_role"><?php wp_dropdown_roles( get_option('default_role') ); ?></select>
-</td>
-</tr>
-<?php } else { ?>
-<tr>
-<th scope="row"><label for="new_admin_email"><?php _e('Email Address') ?> </label></th>
-<td><input name="new_admin_email" type="email" id="new_admin_email" aria-describedby="new-admin-email-description" value="<?php form_option( 'admin_email' ); ?>" class="regular-text ltr" />
-<p class="description" id="new-admin-email-description"><?php _e( 'This address is used for admin purposes. If you change this we will send you an email at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ) ?></p>
-<?php
-$new_admin_email = get_option( 'new_admin_email' );
-if ( $new_admin_email && $new_admin_email != get_option('admin_email') ) : ?>
-<div class="updated inline">
-<p><?php
-        printf(
-                /* translators: %s: new admin email */
-                __( 'There is a pending change of the admin email to %s.' ),
-                '<code>' . esc_html( $new_admin_email ) . '</code>'
-        );
-        printf(
-                ' <a href="%1$s">%2$s</a>',
-                esc_url( wp_nonce_url( admin_url( 'options.php?dismiss=new_admin_email' ), 'dismiss-' . get_current_blog_id() . '-new_admin_email' ) ),
-                __( 'Cancel' )
-        );
-?></p>
+<div class="settings-fields">
+<?php do_settings_fields( 'general', 'default' ); ?>
 </div>
-<?php endif; ?>
-</td>
-</tr>
-<?php }
 
-$languages = get_available_languages();
-$translations = wp_get_available_translations();
-if ( ! is_multisite() && defined( 'WPLANG' ) && '' !== WPLANG && 'en_US' !== WPLANG && ! in_array( WPLANG, $languages ) ) {
-        $languages[] = WPLANG;
-}
-if ( ! empty( $languages ) || ! empty( $translations ) ) {
-        ?>
-        <tr>
-                <th width="33%" scope="row"><label for="WPLANG"><?php _e( 'Site Language' ); ?></label></th>
-                <td>
-                        <?php
-                        $locale = get_locale();
-                        if ( ! in_array( $locale, $languages ) ) {
-                                $locale = '';
-                        }
-
-                        wp_dropdown_languages( array(
-                                'name'         => 'WPLANG',
-                                'id'           => 'WPLANG',
-                                'selected'     => $locale,
-                                'languages'    => $languages,
-                                'translations' => $translations,
-                                'show_available_translations' => ( ! is_multisite() || is_super_admin() ) && wp_can_install_language_pack(),
-                        ) );
-
-                        // Add note about deprecated WPLANG constant.
-                        if ( defined( 'WPLANG' ) && ( '' !== WPLANG ) && $locale !== WPLANG ) {
-                                if ( is_multisite() && current_user_can( 'manage_network_options' )
-                                        || ! is_multisite() && current_user_can( 'manage_options' ) ) {
-                                        ?>
-                                        <p class="description">
-                                                <strong><?php _e( 'Note:' ); ?></strong> <?php printf( __( 'The %s constant in your %s file is no longer needed.' ), '<code>WPLANG</code>', '<code>wp-config.php</code>' ); ?>
-                                        </p>
-                                        <?php
-                                }
-                                _deprecated_argument( 'define()', '4.0.0', sprintf( __( 'The %s constant in your %s file is no longer needed.' ), 'WPLANG', 'wp-config.php' ) );
-                        }
-                        ?>
-                </td>
-        </tr>
-        <?php
-}
-?>
-<tr>
-<?php
-$current_offset = get_option('gmt_offset');
-$tzstring = get_option('timezone_string');
-
-$check_zone_info = true;
-
-// Remove old Etc mappings. Fallback to gmt_offset.
-if ( false !== strpos($tzstring,'Etc/GMT') )
-        $tzstring = '';
-
-if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
-        $check_zone_info = false;
-        if ( 0 == $current_offset )
-                $tzstring = 'UTC+0';
-        elseif ($current_offset < 0)
-                $tzstring = 'UTC' . $current_offset;
-        else
-                $tzstring = 'UTC+' . $current_offset;
-}
-
-?>
-<th scope="row"><label for="timezone_string"><?php _e('Timezone') ?></label></th>
-<td>
-
-<select id="timezone_string" name="timezone_string" aria-describedby="timezone-description">
-        <?php echo wp_timezone_choice( $tzstring, get_user_locale() ); ?>
-</select>
-
-<p class="description" id="timezone-description"><?php _e( 'Choose either a city in the same timezone as you or a UTC timezone offset.' ); ?></p>
-
-<p class="timezone-info">
-        <span id="utc-time"><?php
-                /* translators: 1: UTC abbreviation, 2: UTC time */
-                printf( __( 'Universal time (%1$s) is %2$s.' ),
-                        '<abbr>' . __( 'UTC' ) . '</abbr>',
-                        '<code>' . date_i18n( $timezone_format, false, true ) . '</code>'
-                );
-        ?></span>
-<?php if ( get_option( 'timezone_string' ) || ! empty( $current_offset ) ) : ?>
-        <span id="local-time"><?php
-                /* translators: %s: local time */
-                printf( __( 'Local time is %s.' ),
-                        '<code>' . date_i18n( $timezone_format ) . '</code>'
-                );
-        ?></span>
-<?php endif; ?>
-</p>
-
-<?php if ( $check_zone_info && $tzstring ) : ?>
-<p class="timezone-info">
-<span>
-        <?php
-        // Set TZ so localtime works.
-        date_default_timezone_set($tzstring);
-        $now = localtime(time(), true);
-        if ( $now['tm_isdst'] )
-                _e('This timezone is currently in daylight saving time.');
-        else
-                _e('This timezone is currently in standard time.');
-        ?>
-        <br />
-        <?php
-        $allowed_zones = timezone_identifiers_list();
-
-        if ( in_array( $tzstring, $allowed_zones) ) {
-                $found = false;
-                $date_time_zone_selected = new DateTimeZone($tzstring);
-                $tz_offset = timezone_offset_get($date_time_zone_selected, date_create());
-                $right_now = time();
-                foreach ( timezone_transitions_get($date_time_zone_selected) as $tr) {
-                        if ( $tr['ts'] > $right_now ) {
-                            $found = true;
-                                break;
-                        }
-                }
-
-                if ( $found ) {
-                        echo ' ';
-                        $message = $tr['isdst'] ?
-                                /* translators: %s: date and time  */
-                                __( 'Daylight saving time begins on: %s.')  :
-                                /* translators: %s: date and time  */
-                                __( 'Standard time begins on: %s.' );
-                        // Add the difference between the current offset and the new offset to ts to get the correct transition time from date_i18n().
-                        printf( $message,
-                                '<code>' . date_i18n(
-                                        __( 'F j, Y' ) . ' ' . __( 'g:i a' ),
-                                        $tr['ts'] + ( $tz_offset - $tr['offset'] )
-                                ) . '</code>'
-                        );
-                } else {
-                        _e( 'This timezone does not observe daylight saving time.' );
-                }
-        }
-        // Set back to UTC.
-        date_default_timezone_set('UTC');
-        ?>
-        </span>
-</p>
-<?php endif; ?>
-</td>
-
-</tr>
-<tr>
-<th scope="row"><?php _e('Date Format') ?></th>
-<td>
-        <fieldset><legend class="screen-reader-text"><span><?php _e('Date Format') ?></span></legend>
-<?php
-        /**
-        * Filters the default date formats.
-        *
-        * @since 2.7.0
-        * @since 4.0.0 Added ISO date standard YYYY-MM-DD format.
-        *
-        * @param array $default_date_formats Array of default date formats.
-        */
-        $date_formats = array_unique( apply_filters( 'date_formats', array( __( 'F j, Y' ), 'Y-m-d', 'm/d/Y', 'd/m/Y' ) ) );
-
-        $custom = true;
-
-        foreach ( $date_formats as $format ) {
-                echo "\t<label><input type='radio' name='date_format' value='" . esc_attr( $format ) . "'";
-                if ( get_option('date_format') === $format ) { // checked() uses "==" rather than "==="
-                        echo " checked='checked'";
-                        $custom = false;
-                }
-                echo ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span><code>' . esc_html( $format ) . "</code></label><br />\n";
-        }
-
-        echo '<label><input type="radio" name="date_format" id="date_format_custom_radio" value="\c\u\s\t\o\m"';
-        checked( $custom );
-        echo '/> <span class="date-time-text date-time-custom-text">' . __( 'Custom:' ) . '<span class="screen-reader-text"> ' . __( 'enter a custom date format in the following field' ) . '</span></label>' .
-                '<label for="date_format_custom" class="screen-reader-text">' . __( 'Custom date format:' ) . '</label>' .
-                '<input type="text" name="date_format_custom" id="date_format_custom" value="' . esc_attr( get_option( 'date_format' ) ) . '" class="small-text" /></span>' .
-                '<span class="screen-reader-text">' . __( 'example:' ) . ' </span> <span class="example">' . date_i18n( get_option( 'date_format' ) ) . '</span>' .
-                "<span class='spinner'></span>\n";
-?>
-        </fieldset>
-</td>
-</tr>
-<tr>
-<th scope="row"><?php _e('Time Format') ?></th>
-<td>
-        <fieldset><legend class="screen-reader-text"><span><?php _e('Time Format') ?></span></legend>
-<?php
-        /**
-        * Filters the default time formats.
-        *
-        * @since 2.7.0
-        *
-        * @param array $default_time_formats Array of default time formats.
-        */
-        $time_formats = array_unique( apply_filters( 'time_formats', array( __( 'g:i a' ), 'g:i A', 'H:i' ) ) );
-
-        $custom = true;
-
-        foreach ( $time_formats as $format ) {
-                echo "\t<label><input type='radio' name='time_format' value='" . esc_attr( $format ) . "'";
-                if ( get_option('time_format') === $format ) { // checked() uses "==" rather than "==="
-                        echo " checked='checked'";
-                        $custom = false;
-                }
-                echo ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span><code>' . esc_html( $format ) . "</code></label><br />\n";
-        }
-
-        echo '<label><input type="radio" name="time_format" id="time_format_custom_radio" value="\c\u\s\t\o\m"';
-        checked( $custom );
-        echo '/> <span class="date-time-text date-time-custom-text">' . __( 'Custom:' ) . '<span class="screen-reader-text"> ' . __( 'enter a custom time format in the following field' ) . '</span></label>' .
-                '<label for="time_format_custom" class="screen-reader-text">' . __( 'Custom time format:' ) . '</label>' .
-                '<input type="text" name="time_format_custom" id="time_format_custom" value="' . esc_attr( get_option( 'time_format' ) ) . '" class="small-text" /></span>' .
-                '<span class="screen-reader-text">' . __( 'example:' ) . ' </span> <span class="example">' . date_i18n( get_option( 'time_format' ) ) . '</span>' .
-                "<span class='spinner'></span>\n";
-
-        echo "\t<p class='date-time-doc'>" . __('<a href="https://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date and time formatting</a>.') . "</p>\n";
-?>
-        </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'); ?>
-</table>
-
 <?php do_settings_sections('general'); ?>
 
 <?php submit_button(); ?>