diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-09-17 10:06:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-17 10:06:19 +0200 |
| commit | d43a478840ace4cf827643f3254288b66eb75a8a (patch) | |
| tree | 3a1b980e3d8efcd265d148709520a2f329b7df72 | |
| parent | 9629015b4bef62898e38f34b5951407f941827cf (diff) | |
| parent | 3487f0d281ad3eaf1091e95788b2499d82ec4509 (diff) | |
| download | nextcloud-server-d43a478840ace4cf827643f3254288b66eb75a8a.tar.gz nextcloud-server-d43a478840ace4cf827643f3254288b66eb75a8a.zip | |
Merge pull request #17159 from nextcloud/bugfix/17004/birthday_service_fixes
Sabre/VObject returns a DateAndOrTime object now, so adapt to it in Birthday service
| -rw-r--r-- | apps/dav/lib/CalDAV/BirthdayService.php | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/apps/dav/lib/CalDAV/BirthdayService.php b/apps/dav/lib/CalDAV/BirthdayService.php index 278373733a4..a4326f54f64 100644 --- a/apps/dav/lib/CalDAV/BirthdayService.php +++ b/apps/dav/lib/CalDAV/BirthdayService.php @@ -243,7 +243,11 @@ class BirthdayService { } try { - $date = new \DateTime($birthday); + if ($birthday instanceof DateAndOrTime) { + $date = $birthday->getDateTime(); + } else { + $date = new \DateTimeImmutable($birthday); + } } catch (Exception $e) { return null; } @@ -259,10 +263,13 @@ class BirthdayService { ); $vEvent->DTSTART['VALUE'] = 'DATE'; $vEvent->add('DTEND'); - $date->add(new \DateInterval('P1D')); + + $dtEndDate = (new \DateTime())->setTimestamp($date->getTimeStamp()); + $dtEndDate->add(new \DateInterval('P1D')); $vEvent->DTEND->setDateTime( - $date + $dtEndDate ); + $vEvent->DTEND['VALUE'] = 'DATE'; $vEvent->{'UID'} = $doc->UID . $postfix; $vEvent->{'RRULE'} = 'FREQ=YEARLY'; @@ -306,7 +313,7 @@ class BirthdayService { foreach($books as $book) { $cards = $this->cardDavBackEnd->getCards($book['id']); foreach($cards as $card) { - $this->onCardChanged($book['id'], $card['uri'], $card['carddata']); + $this->onCardChanged((int) $book['id'], $card['uri'], $card['carddata']); } } } |