diff options
| author | ArthurHoaro <arthur@hoa.ro> | 2016-10-12 13:58:35 +0200 |
|---|---|---|
| committer | ArthurHoaro <arthur@hoa.ro> | 2016-10-12 13:58:35 +0200 |
| commit | bc22c9a0acb095970e9494cbe8954f0612e05dc0 (patch) | |
| tree | 4e3a94b7469f5b2e3eaf946756235730429bf9d4 /application/TimeZone.php | |
| parent | 890afc32f744859d11b97eb26ed5c030af9b4145 (diff) | |
| parent | ebd67c6e1b40aebdd3a52285ce9ff9412b2a3038 (diff) | |
| download | Shaarli-bc22c9a0acb095970e9494cbe8954f0612e05dc0.tar.gz Shaarli-bc22c9a0acb095970e9494cbe8954f0612e05dc0.tar.zst Shaarli-bc22c9a0acb095970e9494cbe8954f0612e05dc0.zip | |
Merge tag 'v0.7.0' of github.com:shaarli/Shaarli into stable
Release v0.7.0
Diffstat (limited to 'application/TimeZone.php')
| -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() |