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/stable29 branch 2 times, most recently from c727f19 to 4cdce08 Compare December 10, 2025 15:19
$template->addBodyListItem($data['meeting_url_html'] ?? htmlspecialchars($data['meeting_url']), $this->l10n->t('Link:'),
$this->getAbsoluteImagePath('caldav/link.png'), $data['meeting_url'], '', IMipPlugin::IMIP_INDENT);
}

Copy link
Member

Choose a reason for hiding this comment

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

FYI the diff is smaller because for 29 and older there is no bullet list for recurring meetings

@ChristophWurst ChristophWurst marked this pull request as ready for review December 10, 2025 15:23
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
@ChristophWurst ChristophWurst force-pushed the backport/56925/stable29 branch from 4cdce08 to ecdcbb4 Compare December 10, 2025 15:48
@nickvergessen nickvergessen merged commit 737ae01 into stable29 Dec 11, 2025
171 of 182 checks passed
@nickvergessen nickvergessen deleted the backport/56925/stable29 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