fixup! feat(caldav): linkify location in scheduling mails

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
nextcloud · Aug 9, 2023 · ed64f30 · ed64f30
1 parent d4ccf41
commit ed64f30
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/apps/dav/lib/CalDAV/Schedule/IMipService.php b/apps/dav/lib/CalDAV/Schedule/IMipService.php
@@ -110,17 +110,20 @@ private function generateDiffString(VEvent $vevent, VEvent $oldVEvent, string $p
 	 * Like generateDiffString() but linkifies the property values if they are urls.
 	 */
 	private function generateLinkifiedDiffString(VEvent $vevent, VEvent $oldVEvent, string $property, string $default): ?string {
-		$strikethrough = "<span style='text-decoration: line-through'>%s</span><br />%s";
 		if (!isset($vevent->$property)) {
 			return $default;
 		}
-		/** @var string|null $newstring */
-		$newstring = $vevent->$property->getValue();
-		if (isset($oldVEvent->$property) && $oldVEvent->$property->getValue() !== $newstring) {
-			$oldstring = $oldVEvent->$property->getValue();
-			return sprintf($strikethrough, $this->linkify($oldstring) ?? $oldstring, $this->linkify($newstring) ?? $newstring);
-		}
-		return $this->linkify($newstring) ?? $newstring;
+		/** @var string|null $newString */
+		$newString = $vevent->$property->getValue();
+		$oldString = isset($oldVEvent->$property) ? $oldVEvent->$property->getValue() : null;
+		if ($oldString !== $newString) {
+			return sprintf(
+				"<span style='text-decoration: line-through'>%s</span><br />%s",
+				$this->linkify($oldString) ?? $oldString ?? '',
+				$this->linkify($newString) ?? $newString ?? ''
+			);
+		}
+		return $this->linkify($newString) ?? $newString;
 	}
 
 	/**