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

[stable26] fix(dav): add string comparison for diff
nextcloud · Apr 13, 2023 · 426aa8a · 426aa8a
2 parents 75f1471 + 29547e1
commit 426aa8a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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('<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 @@ 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:'),