Skip to content

[stable30] fix(dav): handle HTML in CalDAV invitations - #56963

Merged
nickvergessen merged 1 commit into
stable30from
backport/56925/stable30
Dec 11, 2025
Merged

[stable30] fix(dav): handle HTML in CalDAV invitations#56963
nickvergessen merged 1 commit into
stable30from
backport/56925/stable30

Conversation

@backportbot

@backportbotbackportbotBot commented Dec 10, 2025

Copy link
Copy Markdown

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.

@ChristophWurstChristophWurst left a comment

Copy link
Copy Markdown
Member

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
Copy Markdown
Member

CS fixer asks for whitespaces

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
@nickvergessen
nickvergessen merged commit a840aea into stable30Dec 11, 2025
173 of 177 checks passed
@nickvergessen
nickvergessen deleted the backport/56925/stable30 branch December 11, 2025 08:54
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsbugfeature: caldavRelated to CalDAV internalsfeature: dav

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@nickvergessen@ChristophWurst@github-advanced-security