Merge branch '2013.10' into 2014.11
[tine20] / tine20 / Addressbook / Convert / Contact / VCard / Abstract.php
index c98b63f..fda16f0 100644 (file)
@@ -341,7 +341,7 @@ abstract class Addressbook_Convert_Contact_VCard_Abstract implements Tinebase_Co
      */
     protected function _toTine20ModelParseBday(&$data, \Sabre\VObject\Property $property)
     {
      */
     protected function _toTine20ModelParseBday(&$data, \Sabre\VObject\Property $property)
     {
-        $tzone = new DateTimeZone(Tinebase_Core::get(Tinebase_Core::USERTIMEZONE));
+        $tzone = new DateTimeZone(Tinebase_Core::getUserTimezone());
         $data['bday'] = new Tinebase_DateTime($property->getValue(), $tzone);
         $data['bday']->setTimezone(new DateTimeZone('UTC'));
     }
         $data['bday'] = new Tinebase_DateTime($property->getValue(), $tzone);
         $data['bday']->setTimezone(new DateTimeZone('UTC'));
     }
@@ -372,7 +372,7 @@ abstract class Addressbook_Convert_Contact_VCard_Abstract implements Tinebase_Co
     {
         if ($record->bday instanceof Tinebase_DateTime) {
             $date = clone $record->bday;
     {
         if ($record->bday instanceof Tinebase_DateTime) {
             $date = clone $record->bday;
-            $date->setTimezone(Tinebase_Core::get(Tinebase_Core::USERTIMEZONE));
+            $date->setTimezone(Tinebase_Core::getUserTimezone());
             $date = $date->format('Y-m-d');
             $card->add('BDAY', $date);
         }
             $date = $date->format('Y-m-d');
             $card->add('BDAY', $date);
         }