[Pkg-owncloud-commits] [php-sabre-vobject] 39/128: Disabled duplicate timezones.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository php-sabre-vobject.

commit 063b1be51c3651da641d5fdc33b9cf7eed20f27c
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Wed Jan 22 01:46:09 2014 -0500

    Disabled duplicate timezones.
    
    This change favors the windows timezones over the lotus one.
    Closes #28.
---
 ChangeLog.md                                  | 1 +
 lib/Sabre/VObject/timezonedata/lotuszones.php | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index ba55109..a762588 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -15,6 +15,7 @@ ChangeLog
 * Fixed: Issue #67. BYMONTH limit on DAILY recurrences.
 * Fixed: Issue #26. Return a more descriptive error when coming across broken
   BYDAY rules.
+* Fixed: Issue #28. Incorrect timezone detection for some timezones.
 
 
 3.1.3 (2013-10-02)
diff --git a/lib/Sabre/VObject/timezonedata/lotuszones.php b/lib/Sabre/VObject/timezonedata/lotuszones.php
index 8523583..996eb45 100644
--- a/lib/Sabre/VObject/timezonedata/lotuszones.php
+++ b/lib/Sabre/VObject/timezonedata/lotuszones.php
@@ -16,12 +16,12 @@ return array(
     'Pacific Standard Time'  => 'America/Los_Angeles',
     'Mexico Standard Time 2' => 'America/Chihuahua',
     'Mountain'               => 'America/Denver',
-    'Mountain Standard Time' => 'America/Chihuahua',
+    'Mountain Standard Time' => 'America/Chihuahua', // conflict with windows timezones.
     'US Mountain'            => 'America/Phoenix',
     'Canada Central'         => 'America/Edmonton',
     'Central America'        => 'America/Guatemala',
     'Central'                => 'America/Chicago',
-    'Central Standard Time'  => 'America/Mexico_City',
+    // 'Central Standard Time'  => 'America/Mexico_City', // conflict with windows timezones.
     'Mexico'                 => 'America/Mexico_City',
     'Eastern'                => 'America/New_York',
     'SA Pacific'             => 'America/Bogota',
@@ -37,7 +37,7 @@ return array(
     'Greenland'              => 'America/Godthab',
     'Montevideo'             => 'America/Montevideo',
     'SA Eastern'             => 'America/Belem',
-    'Mid-Atlantic'           => 'Etc/GMT-2',
+    'Mid-Atlantic'           => 'Etc/GMT-2', // conflict with windows timezones.
     'Azores'                 => 'Atlantic/Azores',
     'Cape Verde'             => 'Atlantic/Cape_Verde',
     'Greenwich'              => 'Atlantic/Reykjavik', // No I'm serious.. Greenwich is not GMT.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabre-vobject.git