diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2023-04-13 08:18:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-13 08:18:16 +0200 |
| commit | 426aa8ae8d650dce43ff4db75d5de6130bdeadc8 (patch) | |
| tree | 78be327c2c81cf42a57b64ce6ed4d3d6b80ee90f | |
| parent | 75f14714e1dbf395a9b0264677188c1d4bc65134 (diff) | |
| parent | 29547e15054d63fa75490e01137aba97e0dcfc7e (diff) | |
| download | nextcloud-server-426aa8ae8d650dce43ff4db75d5de6130bdeadc8.tar.gz nextcloud-server-426aa8ae8d650dce43ff4db75d5de6130bdeadc8.zip | |
Merge pull request #37687 from nextcloud/backport/37626/stable26
[stable26] fix(dav): add string comparison for diff
| -rw-r--r-- | apps/dav/lib/CalDAV/Schedule/IMipService.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/dav/lib/CalDAV/Schedule/IMipService.php b/apps/dav/lib/CalDAV/Schedule/IMipService.php index 50e770e6b40..4caf801bf2d 100644 --- a/apps/dav/lib/CalDAV/Schedule/IMipService.php +++ b/apps/dav/lib/CalDAV/Schedule/IMipService.php @@ -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:'), |