Changeset 18323 for trunk/wp-includes/formatting.php

Timestamp:

06/20/2011 02:58:50 PM (15 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.

File:

• trunk/wp-includes/formatting.php (modified) (1 diff)

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);