Skip to content

Conversation

@zero0cool0
Copy link
Contributor

@zero0cool0 zero0cool0 commented Jul 24, 2023

Summary

getChangesForCalendar always selects the calendars table but should select either calendars or calendarsubscriptions based on function argument calendarType.

*/
public function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limit = null, $calendarType = self::CALENDAR_TYPE_CALENDAR) {
return $this->atomic(function () use ($calendarId, $syncToken, $syncLevel, $limit, $calendarType) {
$table = $calendarType === self::CALENDAR_TYPE_CALENDAR ? 'calendars': 'calendarsubscriptions';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion: You can put this line directly into the callback function.

@tcitworld tcitworld added bug 3. to review Waiting for reviews feature: caldav Related to CalDAV internals labels Jul 24, 2023
@tcitworld tcitworld added this to the Nextcloud 28 milestone Jul 24, 2023
@joshtrichards
Copy link
Member

@zero0cool0 Please sign (DCO) your commit. The tests are failing on that. Click the red DCO fail link for details.

@ChristophWurst ChristophWurst added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Sep 28, 2023
@ChristophWurst
Copy link
Member

/backport to stable27

@ChristophWurst
Copy link
Member

/backport to stable26

@skjnldsv skjnldsv mentioned this pull request Nov 1, 2023
This was referenced Nov 6, 2023
This was referenced Nov 14, 2023
@blizzz blizzz modified the milestones: Nextcloud 28, Nextcloud 29 Nov 23, 2023
@skjnldsv skjnldsv merged commit 9eece36 into nextcloud:master Feb 23, 2024
@backportbot

This comment was marked as resolved.

@skjnldsv
Copy link
Member

/backport to stable28

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to release Ready to be released and/or waiting for tests to finish bug feature: caldav Related to CalDAV internals

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants