diff options
| author | Richard Steinmetz <richard@steinmetz.cloud> | 2024-08-13 17:16:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-13 17:16:40 +0200 |
| commit | bb706998a97c832b50c58e73a2cd92b0ecc4109c (patch) | |
| tree | 85b3cc3dbf2d0634432a2f6d01f231bd9367c284 | |
| parent | 8bf2095001d93e584b4493bb6c3f02d4af630edb (diff) | |
| parent | 82615ce8688da9ecc2c0e4e9353c463e2f4c3fee (diff) | |
| download | nextcloud-server-bb706998a97c832b50c58e73a2cd92b0ecc4109c.tar.gz nextcloud-server-bb706998a97c832b50c58e73a2cd92b0ecc4109c.zip | |
Merge pull request #45786 from nextcloud/fix/caldav/default-vjournal
fix(caldav): allow VJOURNAL if no supported component set is specified
| -rw-r--r-- | apps/dav/lib/CalDAV/CalDavBackend.php | 2 | ||||
| -rw-r--r-- | apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php index 8fff6902f9a..5196a971e74 100644 --- a/apps/dav/lib/CalDAV/CalDavBackend.php +++ b/apps/dav/lib/CalDAV/CalDavBackend.php @@ -755,7 +755,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription 'uri' => $calendarUri, 'synctoken' => 1, 'transparent' => 0, - 'components' => 'VEVENT,VTODO', + 'components' => 'VEVENT,VTODO,VJOURNAL', 'displayname' => $calendarUri ]; diff --git a/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php b/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php index a7ca36ba994..946a2328bf8 100644 --- a/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php +++ b/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php @@ -154,7 +154,7 @@ abstract class AbstractCalDavBackend extends TestCase { $this->assertEquals(self::UNIT_TEST_USER, $calendars[0]['principaluri']); /** @var SupportedCalendarComponentSet $components */ $components = $calendars[0]['{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set']; - $this->assertEquals(['VEVENT','VTODO'], $components->getValue()); + $this->assertEquals(['VEVENT','VTODO','VJOURNAL'], $components->getValue()); $color = $calendars[0]['{http://apple.com/ns/ical/}calendar-color']; $this->assertEquals('#1C4587FF', $color); $this->assertEquals('Example', $calendars[0]['uri']); |