diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-06-17 10:26:33 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-06-17 10:26:33 +0200 |
| commit | 30f522351edfbf2c34b6456001cd9575a2e734ef (patch) | |
| tree | c94a72cbb196e240238f8f78f493ca5081bc9285 /phpBB/includes/acp | |
| parent | a6803e6a18d13872ed197eebc246de6586d8bab0 (diff) | |
| parent | 7f50c269417c97f642ae6a0459014b68b72b693b (diff) | |
| download | forums-30f522351edfbf2c34b6456001cd9575a2e734ef.tar forums-30f522351edfbf2c34b6456001cd9575a2e734ef.tar.gz forums-30f522351edfbf2c34b6456001cd9575a2e734ef.tar.bz2 forums-30f522351edfbf2c34b6456001cd9575a2e734ef.tar.xz forums-30f522351edfbf2c34b6456001cd9575a2e734ef.zip | |
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index be5a7a2f26..cb0593b14a 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -986,6 +986,13 @@ class acp_forums $errors[] = $user->lang['FORUM_NAME_EMPTY']; } + // No Emojis + if (preg_match_all('/[\x{10000}-\x{10FFFF}]/u', $forum_data_ary['forum_name'], $matches)) + { + $character_list = implode('<br>', $matches[0]); + $errors[] = $user->lang('FORUM_NAME_EMOJI', $character_list); + } + if (utf8_strlen($forum_data_ary['forum_desc']) > 4000) { $errors[] = $user->lang['FORUM_DESC_TOO_LONG']; |