Wordpress 2.9.1

[autoinstalls/wordpress.git] / wp-admin / options.php

diff --git a/wp-admin/options.php b/wp-admin/options.php
index a1bb4a0ff35cffdaa03fadc921f9dcc9fb19afba..11d6ee0589d520a22944ea7969322836ea845013 100644 (file)
--- a/wp-admin/options.php
+++ b/wp-admin/options.php
@@ -65,6 +65,12 @@ case 'update':
                        $_POST['date_format'] = $_POST['date_format_custom'];
                if ( !empty($_POST['time_format']) && isset($_POST['time_format_custom']) && '\c\u\s\t\o\m' == stripslashes( $_POST['time_format'] ) )
                        $_POST['time_format'] = $_POST['time_format_custom'];
+               // 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'] = '';
+               }
        }
 
        if ( $options ) {