From 29547e15054d63fa75490e01137aba97e0dcfc7e Mon Sep 17 00:00:00 2001 From: Anna Larch Date: Fri, 7 Apr 2023 00:28:42 +0200 Subject: [PATCH] fix(dav): add string comparison for diff Signed-off-by: Anna Larch --- apps/dav/lib/CalDAV/Schedule/IMipService.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/dav/lib/CalDAV/Schedule/IMipService.php b/apps/dav/lib/CalDAV/Schedule/IMipService.php index 50e770e6b4054..4caf801bf2dfc 100644 --- a/apps/dav/lib/CalDAV/Schedule/IMipService.php +++ b/apps/dav/lib/CalDAV/Schedule/IMipService.php @@ -98,7 +98,7 @@ private function generateDiffString(VEvent $vevent, VEvent $oldVEvent, string $p 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 @@ public function buildBodyData(VEvent $vEvent, ?VEvent $oldVEvent): array { $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('%1$s', $oldUrl) : $data['meeting_url']; + $data['meeting_url_html'] = !empty($oldUrl) && $oldUrl !== $data['meeting_url'] ? sprintf('%1$s', $oldUrl) : $data['meeting_url']; $data['meeting_when_html'] = ($oldMeetingWhen !== $data['meeting_when'] && $oldMeetingWhen !== null) @@ -472,7 +472,7 @@ public function addAttendees(IEMailTemplate $template, VEvent $vevent) { */ 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:'),