Changeset 18323

Timestamp:

06/20/2011 02:58:50 PM (13 years ago)

Author:

westi

Message:

Ensure we have a valid timezone identifier before trying to use it.
Validate the new timezone identifier during option update.
Fixes #17840.

Location:

trunk

Files:

• wp-admin/options-general.php (modified) (2 diffs)
• wp-includes/formatting.php (modified) (1 diff)

trunk/wp-admin/options-general.php

@@ -163 +163 @@
 </select>
 
-    <span id="utc-time"><?php printf(__('<abbr title="Coordinated Universal Time">UTC</abbr> time is <code>%s</code>'), date_i18n($timezone_format, false, 'gmt')); ?></span>
+    <span id="utc-time"><?php printf(__('<abbr title="Coordinated Universal Time">UTC</abbr> time is <code>%s</code>'), date_i18n($timezone_format, false, 'gmt')); ?></span>
 <?php if ( get_option('timezone_string') || !empty($current_offset) ) : ?>
     <span id="local-time"><?php printf(__('Local time is <code>%1$s</code>'), date_i18n($timezone_format)); ?></span>
@@ -183 +183 @@
     <br />
     <?php
-    if ( function_exists('timezone_transitions_get') ) {
+    $allowed_zones = timezone_identifiers_list();
+    
+    if ( in_array( $tzstring, $allowed_zones) ) {
         $found = false;
         $date_time_zone_selected = new DateTimeZone($tzstring);

trunk/wp-includes/formatting.php

@@ -2522 +2522 @@
             break;
 
+        case 'timezone_string':
+            $allowed_zones = timezone_identifiers_list();
+            if ( ! in_array( $value, $allowed_zones ) && ! empty( $value ) ) {
+                $value = get_option( $option ); // Resets option to stored value in the case of failed sanitization
+                if ( function_exists('add_settings_error') )
+                    add_settings_error('timezone_string', 'invalid_timezone_string', __('The timezone you have entered is not valid. Please select a valid timezone.') );
+            }
+            break;
+
         default :
             $value = apply_filters("sanitize_option_{$option}", $value, $option);