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 | |
| 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
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 7 | ||||
| -rw-r--r-- | phpBB/language/en/acp/forums.php | 1 |
2 files changed, 8 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']; diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php index 7a7176369f..d92d3f8c9e 100644 --- a/phpBB/language/en/acp/forums.php +++ b/phpBB/language/en/acp/forums.php @@ -97,6 +97,7 @@ $lang = array_merge($lang, array( 'FORUM_LINK_TRACK_EXPLAIN' => 'Records the number of times a forum link was clicked.', 'FORUM_NAME' => 'Forum name', 'FORUM_NAME_EMPTY' => 'You must enter a name for this forum.', + 'FORUM_NAME_EMOJI' => 'The forum name you entered is invalid.<br>It contains the following unsupported characters:<br>%s', 'FORUM_PARENT' => 'Parent forum', 'FORUM_PASSWORD' => 'Forum password', 'FORUM_PASSWORD_CONFIRM' => 'Confirm forum password', |