vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-07-01 07:40:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not use deprecated Etc timezones. Props miqrogroove. fixes #11558 for trunk

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@12507 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2009-12-23 14:16:36 +00:00
parent 159726cd94
commit 65658aacbf
3 changed files with 61 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/options.php
View File

@@ -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 ) {