Ticket #18146: 18146.2.diff

src/wp-admin/includes/user.php

@@ -94 +94 @@
                 $user->rich_editing = isset( $_POST['rich_editing'] ) && 'false' == $_POST['rich_editing'] ? 'false' : 'true';
                 $user->admin_color = isset( $_POST['admin_color'] ) ? sanitize_text_field( $_POST['admin_color'] ) : 'fresh';
                 $user->show_admin_bar_front = isset( $_POST['admin_bar_front'] ) ? 'true' : 'false';
+
+                // Map UTC+- timezones to gmt_offsets and set timezone_string to empty.
+                if ( !empty($_POST['timezone_string']) && preg_match('/^UTC[+-]/', $_POST['timezone_string']) ) {
+                        $_POST['gmt_offset'] = $_POST['timezone_string'];
+                        $_POST['gmt_offset'] = preg_replace('/UTC\+?/', '', $_POST['gmt_offset']);
+                        $_POST['timezone_string'] = '';
+                }
+
+                $user->timezone_string = isset( $_POST['timezone_string'] ) ? sanitize_text_field( $_POST['timezone_string'] ) : '';
+                $user->gmt_offset = isset( $_POST['gmt_offset'] ) ? sanitize_text_field( $_POST['gmt_offset'] ) : '';
         }
 
         $user->comment_shortcuts = isset( $_POST['comment_shortcuts'] ) && 'true' == $_POST['comment_shortcuts'] ? 'true' : '';

src/wp-admin/user-edit.php

@@ -23 +23 @@
 elseif ( ! get_userdata( $user_id ) )
         wp_die( __('Invalid user ID.') );
 
+// Timezones
+add_filter( 'pre_option_gmt_offset', 'wp_timezone_override_user_offset' );
+
 wp_enqueue_script('user-profile');
 
 $title = IS_PROFILE_PAGE ? __('Profile') : __('Edit User');
@@ -274 +277 @@
 </fieldset>
 </td>
 </tr>
+<tr class="user-timezone">
+<?php
+$current_offset = $profileuser->gmt_offset;
+$tzstring = $profileuser->timezone_string;
+
+$check_zone_info = true;
+
+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"><?php _e( 'Timezone' ) ?></label
+</th>
+<td>
+<select id="timezone_string" name="timezone_string">
+        <?php echo wp_timezone_choice( $tzstring ); ?>
+</select>
+<span id="utc-time"><?php printf( __( '<abbr title="Coordinated Universal Time">UTC</abbr> time is <code>%s</code>' ), date_i18n( _x( 'Y-m-d G:i:s', 'timezone date format' ), false, 'gmt' ) ); ?></span>
+<?php if ( $profileuser->timezone_string || ! empty( $current_offset ) ) : ?>
+        <span id="local-time"><?php printf( __( 'Local time is <code>%1$s</code>' ), date_i18n( _x( 'Y-m-d G:i:s', 'timezone date format' ) ) ); ?></span>
+<?php endif; ?>
+<p class="description"><?php _e( 'Choose a city in the same timezone as you.' ); ?></p>
+<?php if ( $check_zone_info && $tzstring ) : ?>
+        <br />
+        <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'] ?
+                                __('Daylight saving time begins on: <code>%s</code>.') :
+                                __('Standard time begins on: <code>%s</code>.');
+                        // Add the difference between the current offset and the new offset to ts to get the correct transition time from date_i18n().
+                        printf( $message, date_i18n( get_option('date_format') . ' ' . get_option( 'time_format' ), $tr['ts'] + ($tz_offset - $tr['offset']) ) );
+                } else {
+                        _e( 'This timezone does not observe daylight saving time.' );
+                }
+        }
+        // Set back to UTC.
+        date_default_timezone_set( 'UTC' );
+        ?>
+        </span>
+<?php endif; ?>
+</td>
+</tr>
 <?php
 /**
  * Fires at the end of the 'Personal Options' settings table on the user editing screen.

src/wp-includes/default-filters.php

@@ -292 +292 @@
 
 // Timezone
 add_filter( 'pre_option_gmt_offset','wp_timezone_override_offset' );
+if ( is_admin() ) {
+        add_filter( 'pre_option_gmt_offset', 'wp_timezone_override_user_offset' );
+}
 
 // Admin Color Schemes
 add_action( 'admin_init', 'register_admin_color_schemes', 1);

src/wp-includes/functions.php

@@ -3965 +3965 @@
 }
 
 /**
+ * Overrides the gmt_offset with the current user's offset, if available.
+ *
+ * @since 4.3.0
+ *
+ * @return float|false Timezone GMT offset, false otherwise.
+ */
+function wp_timezone_override_user_offset() {
+        global $user_id;
+
+        if ( ! $user_id ) {
+                $user_id = get_current_user_id();
+        }
+
+        $timezone_string = get_user_meta( $user_id, 'timezone_string', true );
+
+        if ( $timezone_string ) {
+                $timezone_object = timezone_open( $timezone_string );
+                $datetime_object = date_create();
+                if ( false !== $timezone_object || false !== $datetime_object ) {
+                        $offset = round( timezone_offset_get( $timezone_object, $datetime_object ) / HOUR_IN_SECONDS, 2 );
+                }
+        } else {
+                $offset = get_user_meta( $user_id, 'gmt_offset', true );
+        }
+
+        return $offset ? $offset : false;
+}
+
+/**
  * Sort-helper for timezones.
  *
  * @since 2.9.0

src/wp-includes/user.php

@@ -2025 +2025 @@
 
         $meta['show_admin_bar_front'] = empty( $userdata['show_admin_bar_front'] ) ? 'true' : $userdata['show_admin_bar_front'];
 
+        $meta['gmt_offset'] = empty( $userdata['gmt_offset'] ) ? '' : $userdata['gmt_offset'];
+        $meta['timezone_string'] = empty( $userdata['timezone_string'] ) ? '' : $userdata['timezone_string'];
+
         $user_nicename_check = $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1" , $user_nicename, $user_login));
 
         if ( $user_nicename_check ) {
@@ -2205 +2208 @@
  * @return array
  */
 function _get_additional_user_keys( $user ) {
-        $keys = array( 'first_name', 'last_name', 'nickname', 'description', 'rich_editing', 'comment_shortcuts', 'admin_color', 'use_ssl', 'show_admin_bar_front' );
+        $keys = array( 'first_name', 'last_name', 'nickname', 'description', 'rich_editing', 'comment_shortcuts', 'admin_color', 'use_ssl', 'show_admin_bar_front', 'gmt_offset', 'timezone_string' );
         return array_merge( $keys, array_keys( wp_get_user_contact_methods( $user ) ) );
 }