fix(dav) Handle Calendar trashbin UID conflicts by removing the deleted calendar object #34375
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
miaulalala
added
bug
2. developing
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| if ($found !== false) { | ||
| // when importing a calendar obejct already previously imported | ||
| // we first restore it and then update the event to the new data | ||
| $this->restoreCalendarObject($result['calendardata']); |
Check failure
Code scanning / Psalm
UndefinedInterfaceMethod
|
/rebase |
nextcloud-command
force-pushed
the
fix/trashbin-uid
branch
from
0a5c963 to
6a78191
Compare
miaulalala
force-pushed
the
fix/trashbin-uid
branch
2 times, most recently
from
ce7e021 to
17b6613
Compare
miaulalala
changed the title
miaulalala
force-pushed
the
fix/trashbin-uid
branch
from
17b6613 to
c20778a
Compare
st3iny
approved these changes
Feb 8, 2023
|
A better commit title please? :) |
miaulalala
changed the title
Signed-off-by: Anna Larch <anna@nextcloud.com>
miaulalala
force-pushed
the
fix/trashbin-uid
branch
from
c20778a to
5b6a0af
Compare
|
Drone failure is apps file sharing as usual |
miaulalala
added
3. to review
artonge
approved these changes
Feb 21, 2023
Merged
|
/backport to stable25 |
|
/backport to stable24 |
|
Shouldn't we make a fix for the delete function as well? Now I get error messages on deletion: Update: Sorry, I most probably misunderstood the code. |
9 tasks
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.
... before re- importing the calendar event.
Fixes #30096