Merge branch '5.5' into 6.0

[GitHub/WoltLab/com.woltlab.wcf.conversation.git] / files / lib / data / conversation / ConversationAction.class.php

diff --git a/files/lib/data/conversation/ConversationAction.class.php b/files/lib/data/conversation/ConversationAction.class.php
index 335ecbb5d07e893f229c14de83b1daf90f97fdb9..2c899940944eb4128a25d736a90dea71f7fe706a 100644 (file)
--- a/files/lib/data/conversation/ConversationAction.class.php
+++ b/files/lib/data/conversation/ConversationAction.class.php
@@ -27,6 +27,7 @@ use wcf\system\user\notification\object\ConversationUserNotificationObject;
 use wcf\system\user\notification\UserNotificationHandler;
 use wcf\system\user\storage\UserStorageHandler;
 use wcf\system\WCF;
+use wcf\util\StringUtil;
 
 /**
  * Executes conversation-related actions.
@@ -857,7 +858,7 @@ class ConversationAction extends AbstractDatabaseObjectAction implements
             );
 
             return [
-                'content' => $conversation->getTitle(),
+                'content' => StringUtil::encodeHTML($conversation->getTitle()),
                 'image' => $image,
                 'isUnread' => $conversation->isNew(),
                 'link' => $link,