upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-16 09:19:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #37687 from nextcloud/backport/37626/stable26

Browse source 
[stable26] fix(dav): add string comparison for diff
This commit is contained in:
John Molakvoæ 2023-04-13 08:18:16 +02:00 committed by GitHub
commit 426aa8ae8d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/dav/lib/CalDAV/Schedule/IMipService.php
View file

@ -98,7 +98,7 @@ class IMipService {
return $default;
}
$newstring = $vevent->$property->getValue();
if(isset($oldVEvent->$property)) {
if(isset($oldVEvent->$property) && $oldVEvent->$property->getValue() !== $newstring ) {
$oldstring = $oldVEvent->$property->getValue();
return sprintf($strikethrough, $oldstring, $newstring);
}
@ -128,7 +128,7 @@ class IMipService {
$data['meeting_location_html'] = $this->generateDiffString($vEvent, $oldVEvent, 'LOCATION', $data['meeting_location']);
$oldUrl = self::readPropertyWithDefault($oldVEvent, 'URL', $defaultVal);
$data['meeting_url_html'] = !empty($oldUrl) ? sprintf('<a href="%1$s">%1$s</a>', $oldUrl) : $data['meeting_url'];
$data['meeting_url_html'] = !empty($oldUrl) && $oldUrl !== $data['meeting_url'] ? sprintf('<a href="%1$s">%1$s</a>', $oldUrl) : $data['meeting_url'];
$data['meeting_when_html'] =
($oldMeetingWhen !== $data['meeting_when'] && $oldMeetingWhen !== null)
@ -472,7 +472,7 @@ class IMipService {
*/
public function addBulletList(IEMailTemplate $template, VEvent $vevent, $data) {
$template->addBodyListItem(
$data['meeting_title'], $this->l10n->t('Title:'),
$data['meeting_title_html'] ?? $data['meeting_title'], $this->l10n->t('Title:'),
$this->getAbsoluteImagePath('caldav/title.png'), $data['meeting_title'], '', IMipPlugin::IMIP_INDENT);
if ($data['meeting_when'] !== '') {
$template->addBodyListItem($data['meeting_when_html'] ?? $data['meeting_when'], $this->l10n->t('Time:'),