Skip to content

Conversation

@backportbot
Copy link

@backportbot backportbot bot commented Dec 10, 2025

Backport of #56925

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot backportbot bot added bug 3. to review Waiting for reviews feature: dav feature: caldav Related to CalDAV internals labels Dec 10, 2025
@ChristophWurst ChristophWurst force-pushed the backport/56925/stable30 branch from e5adee4 to f220d4b Compare December 10, 2025 15:12
@ChristophWurst ChristophWurst marked this pull request as ready for review December 10, 2025 15:12
Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

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

Conflicted on whitespace changes

if (isset($oldVEvent->$property) && $oldVEvent->$property->getValue() !== $newstring) {
$oldstring = $oldVEvent->$property->getValue();
return sprintf($strikethrough, $oldstring, $newstring);
return sprintf($strikethrough, htmlspecialchars($oldstring), $newstring);

Check notice

Code scanning / Psalm

PossiblyNullArgument Note

Argument 3 of sprintf cannot be null, possibly null value provided
@nickvergessen
Copy link
Member

CS fixer asks for whitespaces

@ChristophWurst ChristophWurst force-pushed the backport/56925/stable30 branch from f220d4b to 61eb55b Compare December 10, 2025 15:42
@ChristophWurst ChristophWurst force-pushed the backport/56925/stable30 branch from 61eb55b to 46c324d Compare December 10, 2025 15:47
@nickvergessen nickvergessen merged commit a840aea into stable30 Dec 11, 2025
173 of 177 checks passed
@nickvergessen nickvergessen deleted the backport/56925/stable30 branch December 11, 2025 08:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews bug feature: caldav Related to CalDAV internals feature: dav

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants