Skip to content

Commit

Permalink
Merge pull request #4733 from nextcloud/backport/4730/stable20.1
Browse files Browse the repository at this point in the history
[stable20.1] Prevent issues with utf8mb4 chars on update
  • Loading branch information
nickvergessen authored Dec 9, 2020
2 parents a47733e + cbd56cb commit 773d01b
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions lib/Chat/Changelog/Manager.php
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,6 @@ public function updateChangelog(string $userId): void {
}

public function getChangelogs(): array {
$emojis = $this->l->t('- Spice up your messages with emojis from the emoji picker');
if ($this->connection->supports4ByteText()) {
$emojis = str_replace(
'{emoji}',
'😍',
$this->l->t('- Spice up your messages with emojis from the emoji picker {emoji}')
);
}

return [
$this->l->t(
"Welcome to Nextcloud Talk!\n"
Expand All @@ -118,7 +109,7 @@ public function getChangelogs(): array {
$this->l->t('- Shared files are now opened directly inside the chat view with the viewer apps'),
$this->l->t('New in Talk 10'),
$this->l->t('- You can now search for chats and messages in the unified search in the top bar'),
$emojis,
$this->l->t('- Spice up your messages with emojis from the emoji picker'),
$this->l->t('- You can now change your camera and microphone while being in a call'),
];
}
Expand Down

0 comments on commit 773d01b

Please sign in to comment.