Changes from trunk/wp-admin/options.php at r12411 to branches/2.9/wp-admin/options.php at r12508

File:

• branches/2.9/wp-admin/options.php (modified) (1 diff)

branches/2.9/wp-admin/options.php

@@ -66 +66 @@
                 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'] = '';
+                }
         }