Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 9 Aug 2013 10:27:57 +0000 (12:27 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 9 Aug 2013 10:27:57 +0000 (12:27 +0200)
Conflicts:
tine20/Calendar/Convert/Event/VCalendar/Abstract.php

1  2 
tests/tine20/Calendar/Controller/EventNotificationsTests.php
tests/tine20/Calendar/Convert/Event/VCalendar/GenericTest.php
tests/tine20/Calendar/Import/ICalTest.php
tests/tine20/TestServer.php
tine20/Calendar/Convert/Event/VCalendar/Abstract.php

Simple merge
@@@ -958,10 -945,12 +958,11 @@@ class Calendar_Convert_Event_VCalendar_
      {
          $defaultTimezone = date_default_timezone_get();
          date_default_timezone_set((string) Tinebase_Core::get(Tinebase_Core::USERTIMEZONE));
-         
 -
 -        if ($dateTimeProperty instanceof Sabre_VObject_Element_DateTime) {
 +        if ($dateTimeProperty instanceof VObject\Property\DateTime) {
              $dateTime = $dateTimeProperty->getDateTime();
-             $tz = ($_useUserTZ) ? (string) Tinebase_Core::get(Tinebase_Core::USERTIMEZONE) : $dateTime->getTimezone();
+             $tz = ($_useUserTZ || (isset($dateTimeProperty['VALUE']) && strtoupper($dateTimeProperty['VALUE']) == 'DATE')) ? 
+                 (string) Tinebase_Core::get(Tinebase_Core::USERTIMEZONE) : 
+                 $dateTime->getTimezone();
              $result = new Tinebase_DateTime($dateTime->format(Tinebase_Record_Abstract::ISO8601LONG), $tz);
          } else {
              $result = new Tinebase_DateTime($dateTimeProperty->value);