Ticket #18146: 18146.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';
+                $user->user_timezone = isset( $_POST['user_timezone'] ) && in_array( $_POST['user_timezone'], timezone_identifiers_list() ) ? sanitize_text_field( $_POST['user_timezone'] ) : '';
         }
 
         $user->comment_shortcuts = isset( $_POST['comment_shortcuts'] ) && 'true' == $_POST['comment_shortcuts'] ? 'true' : '';

src/wp-admin/user-edit.php

@@ -279 +279 @@
 </fieldset>
 </td>
 </tr>
+<tr class="user-timezone">
+    <th scope="row"><?php _e('Timezone')?></th>
+    <td>
+        <label for="user_timezone">
+        <select id="user_timezone" name="user_timezone">
+            <?php echo wp_timezone_choice( $profileuser->user_timezone, false ); ?>
+        </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 ( !empty($profileuser->user_timezone) ) : ?>
+            <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>
+    </td>
+</tr>
 <?php
 /**
  * Fires at the end of the 'Personal Options' settings table on the user editing screen.

src/wp-includes/functions.php

@@ -3455 +3455 @@
  *
  * @since 2.9.0
  *
- * @param string $selected_zone Selected Zone
+ * @param string $selected_zone Selected Zone.
+ * @param bool $manual_offsets Whether to include manual GMT offsets. Defaults to true.
  * @return string
  */
-function wp_timezone_choice( $selected_zone ) {
+function wp_timezone_choice( $selected_zone, $manual_offsets = true ) {
         static $mo_loaded = false;
 
         $continents = array( 'Africa', 'America', 'Antarctica', 'Arctic', 'Asia', 'Atlantic', 'Australia', 'Europe', 'Indian', 'Pacific');
@@ -3555 +3556 @@
         $structure[] = '</optgroup>';
 
         // Do manual UTC offsets
-        $structure[] = '<optgroup label="'. esc_attr__( 'Manual Offsets' ) .'">';
-        $offset_range = array (-12, -11.5, -11, -10.5, -10, -9.5, -9, -8.5, -8, -7.5, -7, -6.5, -6, -5.5, -5, -4.5, -4, -3.5, -3, -2.5, -2, -1.5, -1, -0.5,
-                0, 0.5, 1, 1.5, 2, 2.5, 3, 3.5, 4, 4.5, 5, 5.5, 5.75, 6, 6.5, 7, 7.5, 8, 8.5, 8.75, 9, 9.5, 10, 10.5, 11, 11.5, 12, 12.75, 13, 13.75, 14);
-        foreach ( $offset_range as $offset ) {
-                if ( 0 <= $offset )
-                        $offset_name = '+' . $offset;
-                else
-                        $offset_name = (string) $offset;
+        if ( true === $manual_offsets ) {
+                $structure[] = '<optgroup label="' . esc_attr__('Manual Offsets') . '">';
+                $offset_range = array(-12, -11.5, -11, -10.5, -10, -9.5, -9, -8.5, -8, -7.5, -7, -6.5, -6, -5.5, -5, -4.5, -4, -3.5, -3, -2.5, -2, -1.5, -1, -0.5,
+                        0, 0.5, 1, 1.5, 2, 2.5, 3, 3.5, 4, 4.5, 5, 5.5, 5.75, 6, 6.5, 7, 7.5, 8, 8.5, 8.75, 9, 9.5, 10, 10.5, 11, 11.5, 12, 12.75, 13, 13.75, 14);
+                foreach ($offset_range as $offset) {
+                        if (0 <= $offset)
+                                $offset_name = '+' . $offset;
+                        else
+                                $offset_name = (string)$offset;
 
-                $offset_value = $offset_name;
-                $offset_name = str_replace(array('.25','.5','.75'), array(':15',':30',':45'), $offset_name);
-                $offset_name = 'UTC' . $offset_name;
-                $offset_value = 'UTC' . $offset_value;
-                $selected = '';
-                if ( $offset_value === $selected_zone )
-                        $selected = 'selected="selected" ';
-                $structure[] = '<option ' . $selected . 'value="' . esc_attr( $offset_value ) . '">' . esc_html( $offset_name ) . "</option>";
+                        $offset_value = $offset_name;
+                        $offset_name = str_replace(array('.25','.5','.75'), array(':15',':30',':45'), $offset_name);
+                        $offset_name = 'UTC' . $offset_name;
+                        $offset_value = 'UTC' . $offset_value;
+                        $selected = '';
+                        if ( $offset_value === $selected_zone )
+                                $selected = 'selected="selected" ';
+                        $structure[] = '<option ' . $selected . 'value="' . esc_attr( $offset_value ) . '">' . esc_html( $offset_name ) . "</option>";
 
+                }
+                $structure[] = '</optgroup>';
         }
-        $structure[] = '</optgroup>';
 
         return join( "\n", $structure );
 }

src/wp-includes/user.php

@@ -1855 +1855 @@
  * @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', 'user_timezone' );
         return array_merge( $keys, array_keys( wp_get_user_contact_methods( $user ) ) );
 }