aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-08-11 17:15:46 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-08-11 17:15:46 +0200
commit0854c7226dac3e241fa7a9a8bb6a49e257bd8c5d (patch)
tree6d09293d98b66291e1f2c624425576b5c1f0b925 /phpBB/language/en
parent5fe3719f13ef6e7b85276af3d029cfdfc07b5637 (diff)
parentd18e5473327fe7edf1fdaec13db8a9079a2168ac (diff)
downloadforums-0854c7226dac3e241fa7a9a8bb6a49e257bd8c5d.tar
forums-0854c7226dac3e241fa7a9a8bb6a49e257bd8c5d.tar.gz
forums-0854c7226dac3e241fa7a9a8bb6a49e257bd8c5d.tar.bz2
forums-0854c7226dac3e241fa7a9a8bb6a49e257bd8c5d.tar.xz
forums-0854c7226dac3e241fa7a9a8bb6a49e257bd8c5d.zip
Merge pull request #5651 from 3D-I/ticket/15897
[ticket/15897] Fix Emojis' SQL Error in Attachment Comment
Diffstat (limited to 'phpBB/language/en')
-rw-r--r--phpBB/language/en/posting.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 11ea6483e1..426475e77a 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -43,6 +43,7 @@ $lang = array_merge($lang, array(
'ADD_POLL' => 'Poll creation',
'ADD_POLL_EXPLAIN' => 'If you do not want to add a poll to your topic leave the fields blank.',
'ALREADY_DELETED' => 'Sorry but this message is already deleted.',
+ 'ATTACH_COMMENT_NO_EMOJIS' => 'The attachment comment contains forbidden characters (Emoji).',
'ATTACH_DISK_FULL' => 'There is not enough free disk space to post this attachment.',
'ATTACH_QUOTA_REACHED' => 'Sorry, the board attachment quota has been reached.',
'ATTACH_SIG' => 'Attach a signature (signatures can be altered via the UCP)',