Skip to content

Commit 30c611e

Browse files
Merge pull request #4734 from nextcloud/backport/4730/stable20
[stable20] Prevent issues with utf8mb4 chars on update
2 parents 7c2a29c + 61fa934 commit 30c611e

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

lib/Chat/Changelog/Manager.php

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,6 @@ public function updateChangelog(string $userId): void {
8484
}
8585

8686
public function getChangelogs(): array {
87-
$emojis = $this->l->t('- Spice up your messages with emojis from the emoji picker');
88-
if ($this->connection->supports4ByteText()) {
89-
$emojis = str_replace(
90-
'{emoji}',
91-
'😍',
92-
$this->l->t('- Spice up your messages with emojis from the emoji picker {emoji}')
93-
);
94-
}
95-
9687
return [
9788
$this->l->t(
9889
"Welcome to Nextcloud Talk!\n"
@@ -118,7 +109,7 @@ public function getChangelogs(): array {
118109
$this->l->t('- Shared files are now opened directly inside the chat view with the viewer apps'),
119110
$this->l->t('New in Talk 10'),
120111
$this->l->t('- You can now search for chats and messages in the unified search in the top bar'),
121-
$emojis,
112+
$this->l->t('- Spice up your messages with emojis from the emoji picker'),
122113
$this->l->t('- You can now change your camera and microphone while being in a call'),
123114
];
124115
}

0 commit comments

Comments
 (0)