diff options
| author | Arthur <arthur@hoa.ro> | 2016-05-05 13:21:36 +0200 |
|---|---|---|
| committer | Arthur <arthur@hoa.ro> | 2016-05-05 13:21:36 +0200 |
| commit | 86deafe0ff5a22a37255546cf82325e89bf272b1 (patch) | |
| tree | e10c9ffb84f6acacc5df2b2e42cb23f9d0b6ab7f /application | |
| parent | 47be06098396b5eef35234b88227d64ab81bd988 (diff) | |
| parent | 12ff86c961b49727fcae97938e864766aa77a2a9 (diff) | |
| download | Shaarli-86deafe0ff5a22a37255546cf82325e89bf272b1.tar.gz Shaarli-86deafe0ff5a22a37255546cf82325e89bf272b1.tar.zst Shaarli-86deafe0ff5a22a37255546cf82325e89bf272b1.zip | |
Merge pull request #551 from ArthurHoaro/hotfix/timezone
Use correct 'UTC' timezone
Diffstat (limited to 'application')
| -rw-r--r-- | application/TimeZone.php | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/application/TimeZone.php b/application/TimeZone.php index e363d90a..26f2232d 100644 --- a/application/TimeZone.php +++ b/application/TimeZone.php | |||
| @@ -101,10 +101,6 @@ function generateTimeZoneForm($preselectedTimezone='') | |||
| 101 | */ | 101 | */ |
| 102 | function isTimeZoneValid($continent, $city) | 102 | function isTimeZoneValid($continent, $city) |
| 103 | { | 103 | { |
| 104 | if ($continent == 'UTC' && $city == 'UTC') { | ||
| 105 | return true; | ||
| 106 | } | ||
| 107 | |||
| 108 | return in_array( | 104 | return in_array( |
| 109 | $continent.'/'.$city, | 105 | $continent.'/'.$city, |
| 110 | timezone_identifiers_list() | 106 | timezone_identifiers_list() |