From 7643338f7587ab8ceead6b1733762ef87b7a922e Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Fri, 22 May 2009 18:16:40 +0000 Subject: [PATCH] Standardize on UTC. Props Denis-de-Bernardy. fixes #9793 git-svn-id: https://develop.svn.wordpress.org/trunk@11434 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/functions.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 415d39f193..454417d39c 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -3141,6 +3141,8 @@ function wp_timezone_choice($selectedzone) { $zone = explode('/',$zone); if ( ! in_array($zone[0], $continents) ) continue; + if ( $zone[0] == 'Etc' && in_array($zone[1], array('UCT', 'GMT', 'GMT0', 'GMT+0', 'GMT-0', 'Greenwich', 'Universal', 'Zulu')) ) + continue; $zonen[$i]['continent'] = isset($zone[0]) ? $zone[0] : ''; $zonen[$i]['city'] = isset($zone[1]) ? $zone[1] : ''; $zonen[$i]['subcity'] = isset($zone[2]) ? $zone[2] : '';