Bug fix: Select the correct table based on CALENDAR_TYPE_CALENDAR #39553
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zero0cool0
requested review from
ChristophWurst,
miaulalala and
tcitworld
as code owners
tcitworld
approved these changes
Jul 24, 2023
| @@ -2277,11 +2277,13 @@ public function getCalendarObjectById(string $principalUri, int $id): ?array { | |||
| * @return array | |||
| */ | |||
| 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'; | |||
There was a problem hiding this comment.
suggestion: You can put this line directly into the callback function.
tcitworld
added
bug
3. to review
ChristophWurst
approved these changes
Jul 24, 2023
|
@zero0cool0 Please sign (DCO) your commit. The tests are failing on that. Click the red DCO fail link for details. |
zero0cool0
force-pushed
the
fix/caldavbackend_getChangesForCalendar
branch
from
e32b22a
to
a0ca75a
Compare
ChristophWurst
force-pushed
the
fix/caldavbackend_getChangesForCalendar
branch
from
6f7e948
to
cafd321
Compare
ChristophWurst
added
4. to release
|
/backport to stable27 |
|
/backport to stable26 |
Merged
blizzz
force-pushed
the
fix/caldavbackend_getChangesForCalendar
branch
from
cafd321
to
3f164f6
Compare
Signed-off-by: Patrick Fischer <[email protected]>
skjnldsv
force-pushed
the
fix/caldavbackend_getChangesForCalendar
branch
from
3f164f6
to
0f16153
Compare
This comment was marked as resolved.
This comment was marked as resolved.
|
/backport to stable28 |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
getChangesForCalendaralways selects thecalendarstable but should select eithercalendarsorcalendarsubscriptionsbased on function argumentcalendarType.