Fix duplicate entry on timezones list in rcube_config::timezone_name_from_abbr() (#1490293)

9 years ago · df4243b80a
parent c4104166e3
commit df4243b80a
2 changed files with 1 additions and 1 deletions
--- a/1
+++ b/1
@ -18,6 +18,7 @@ CHANGELOG Roundcube Webmail
 - Fix duplicate entries supression in autocomplete result (#1490290)
 - Fix "Non-static method PEAR::isError() should not be called statically" errors (#1490281)
 - Fix parsing invalid HTML messages with BOM after <!DOCTYPE> (#1490291)
+- Fix duplicate entry on timezones list in rcube_config::timezone_name_from_abbr() (#1490293)

 RELEASE 1.1.0
 -------------
--- a/program/lib/Roundcube/rcube_config.php
+++ b/program/lib/Roundcube/rcube_config.php
@ -683,7 +683,6 @@ class rcube_config
             '180' => "Europe/Moscow",
             '210' => "Asia/Tehran",
             '240' => "Asia/Dubai",
-             '300' => "Asia/Karachi",
             '270' => "Asia/Kabul",
             '300' => "Asia/Karachi",
             '330' => "Asia/Kolkata",