Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/spreed.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2019-07-26 18:10:36 +0300
committerJoas Schilling <coding@schilljs.com>2019-07-30 10:34:47 +0300
commit25aae9f512c8ce291834166a438d220b1e7d62cc (patch)
tree7d503f498c289ee604fa05962a9d9fa420f110b0 /lib/Controller
parent1005aaab4932c4f32f85d7ad9bca6e30cba80293 (diff)
Make sure we don't change the comments object as that will update the database
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/Controller')
-rw-r--r--lib/Controller/ChatController.php2
-rw-r--r--lib/Controller/RoomController.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Controller/ChatController.php b/lib/Controller/ChatController.php
index 974b9aefb..5073804e8 100644
--- a/lib/Controller/ChatController.php
+++ b/lib/Controller/ChatController.php
@@ -348,7 +348,7 @@ class ChatController extends AEnvironmentAwareController {
'timestamp' => $message->getComment()->getCreationDateTime()->getTimestamp(),
'message' => $message->getMessage(),
'messageParameters' => $message->getMessageParameters(),
- 'systemMessage' => $message->getMessageType() === 'system' ? $message->getComment()->getMessage() : '',
+ 'systemMessage' => $message->getMessageType() === 'system' ? $message->getMessageRaw() : '',
];
}
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 5018ae37e..7a547a012 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -327,7 +327,7 @@ class RoomController extends AEnvironmentAwareController {
'timestamp' => $lastMessage->getCreationDateTime()->getTimestamp(),
'message' => $message->getMessage(),
'messageParameters' => $message->getMessageParameters(),
- 'systemMessage' => $message->getMessageType() === 'system' ? $lastMessage->getMessage() : '',
+ 'systemMessage' => $message->getMessageType() === 'system' ? $message->getMessageRaw() : '',
];
}