diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-08-11 17:15:50 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-08-11 17:15:50 +0200 |
| commit | 96335c0402e164768b5335767ec95c766dc033a3 (patch) | |
| tree | 86b2279daaeb719b81ca04efeb87be652621c763 /phpBB/includes | |
| parent | bf6f1cac8fa3adf0b090c1d082818f2aa5d81834 (diff) | |
| parent | 0854c7226dac3e241fa7a9a8bb6a49e257bd8c5d (diff) | |
| download | forums-96335c0402e164768b5335767ec95c766dc033a3.tar forums-96335c0402e164768b5335767ec95c766dc033a3.tar.gz forums-96335c0402e164768b5335767ec95c766dc033a3.tar.bz2 forums-96335c0402e164768b5335767ec95c766dc033a3.tar.xz forums-96335c0402e164768b5335767ec95c766dc033a3.zip | |
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index cf511ec247..d150845952 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -2045,6 +2045,11 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll_ary, &$data continue; } + if (preg_match('/[\x{10000}-\x{10FFFF}]/u', $attach_row['attach_comment'])) + { + trigger_error('ATTACH_COMMENT_NO_EMOJIS'); + } + if (!$attach_row['is_orphan']) { // update entry in db if attachment already stored in db and filespace |