From 89a42322d022d93fe8604d200cc75835f0d9e0f9 Mon Sep 17 00:00:00 2001 From: Yuriy Bakhtin Date: Wed, 10 Mar 2021 15:14:01 +0300 Subject: [PATCH] =?UTF-8?q?Fix=20convert=20emoji=20with=20sign=20=E2=80=9C?= =?UTF-8?q?+=E2=80=9D=20(#4957)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Lucas Bartholemy --- CHANGELOG.md | 1 + .../richtext/extensions/emoji/RichTextEmojiExtension.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 800d490d37..cbb6e33fbf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ HumHub Changelog - Fix #4942: MemberOf Display in LDAP CLI Show User Details - Fix #4465: LDAP PHP 8 incompatibility (multiPageSearch) - Fix #4946: Fix migration of the default permissions +- Fix #4955: Fix convert emoji with sign "+" - Fix #4956: Fix file hash column length diff --git a/protected/humhub/modules/content/widgets/richtext/extensions/emoji/RichTextEmojiExtension.php b/protected/humhub/modules/content/widgets/richtext/extensions/emoji/RichTextEmojiExtension.php index 3cf33e2abc..396e07f231 100644 --- a/protected/humhub/modules/content/widgets/richtext/extensions/emoji/RichTextEmojiExtension.php +++ b/protected/humhub/modules/content/widgets/richtext/extensions/emoji/RichTextEmojiExtension.php @@ -20,7 +20,7 @@ class RichTextEmojiExtension extends RichTextContentExtension /** * @inheritdoc */ - const REGEX = '/[:|;](([A-Za-z0-9_-])+)[:|;]/'; + const REGEX = '/[:|;](([A-Za-z0-9_\-+])+)[:|;]/'; /** * @inheritdoc