diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-26 18:08:49 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-26 18:08:49 +0200 |
| commit | 2b10371bdeb2c8a3d5cc2617ada5cf8195c264c9 (patch) | |
| tree | f25b463c90992764887416c3082098fed6ecac65 /lib/vobject.php | |
| parent | 40f95ffdf3edf9ab45c15bd5b9018d7f4d92baa9 (diff) | |
| parent | 127796218314c6b1f19ba86f74caa913375aac8d (diff) | |
| download | nextcloud-server-2b10371bdeb2c8a3d5cc2617ada5cf8195c264c9.tar.gz nextcloud-server-2b10371bdeb2c8a3d5cc2617ada5cf8195c264c9.zip | |
fix merge conflicts
Diffstat (limited to 'lib/vobject.php')
| -rw-r--r-- | lib/vobject.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/vobject.php b/lib/vobject.php index e3479fc6d36..ec80e1d605a 100644 --- a/lib/vobject.php +++ b/lib/vobject.php @@ -41,7 +41,7 @@ class OC_VObject{ */ public static function parse($data){ try { - Sabre_VObject_Reader::$elementMap['LAST-MODIFIED'] = 'Sabre_VObject_Element_DateTime'; + Sabre_VObject_Property::$classMap['LAST-MODIFIED'] = 'Sabre_VObject_Property_DateTime'; $vobject = Sabre_VObject_Reader::read($data); if ($vobject instanceof Sabre_VObject_Component){ $vobject = new OC_VObject($vobject); @@ -150,12 +150,12 @@ class OC_VObject{ * @param int $dateType * @return void */ - public function setDateTime($name, $datetime, $dateType=Sabre_VObject_Element_DateTime::LOCALTZ){ + public function setDateTime($name, $datetime, $dateType=Sabre_VObject_Property_DateTime::LOCALTZ){ if ($datetime == 'now'){ $datetime = new DateTime(); } if ($datetime instanceof DateTime){ - $datetime_element = new Sabre_VObject_Element_DateTime($name); + $datetime_element = new Sabre_VObject_Property_DateTime($name); $datetime_element->setDateTime($datetime, $dateType); $this->vobject->__set($name, $datetime_element); }else{ |