From 8b2a3805b6afa2d6b3e5fd7a2b7b2d7a4787c782 Mon Sep 17 00:00:00 2001 From: Matthias Moritz Date: Fri, 2 Dec 2022 20:42:16 +0100 Subject: [PATCH 1/2] Update Event.php fixing double encoding issue in event view. fixes #12308 --- src/Model/Event.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Model/Event.php b/src/Model/Event.php index 5d71dd16af..0bba1f7cd6 100644 --- a/src/Model/Event.php +++ b/src/Model/Event.php @@ -673,7 +673,7 @@ class Event $event['author-link'] = Contact::magicLink($event['author-link']); $event['summary'] = BBCode::convertForUriId($event['uri-id'], Strings::escapeHtml($event['summary'])); - $event['desc'] = BBCode::convertForUriId($event['uri-id'], Strings::escapeHtml($event['desc'])); + $event['desc'] = Strings::escapeHtml($event['desc']); $event['location'] = BBCode::convertForUriId($event['uri-id'], Strings::escapeHtml($event['location'])); return [ From f27d9cb73e399794dedc8ece1ac3a8a285016f2a Mon Sep 17 00:00:00 2001 From: Matthias Moritz Date: Fri, 2 Dec 2022 20:59:24 +0100 Subject: [PATCH 2/2] Update Event.php --- src/Model/Event.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/Model/Event.php b/src/Model/Event.php index 0bba1f7cd6..06d391745d 100644 --- a/src/Model/Event.php +++ b/src/Model/Event.php @@ -672,9 +672,6 @@ class Event } $event['author-link'] = Contact::magicLink($event['author-link']); - $event['summary'] = BBCode::convertForUriId($event['uri-id'], Strings::escapeHtml($event['summary'])); - $event['desc'] = Strings::escapeHtml($event['desc']); - $event['location'] = BBCode::convertForUriId($event['uri-id'], Strings::escapeHtml($event['location'])); return [ 'id' => $event['id'],