diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-09-06 19:07:25 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-09-06 19:07:25 +0200 |
| commit | 1084b91b66245370052ec55f4ca653725fb85115 (patch) | |
| tree | 9047f7a4be8446c04153df3271c7f0b28e40f2ee /phpBB | |
| parent | 1e605efaf126f5474bb1be99e7fdaed834ebb2a0 (diff) | |
| parent | 837dc9b3a737e68d12eef033572894a81a2c0de7 (diff) | |
| download | forums-1084b91b66245370052ec55f4ca653725fb85115.tar forums-1084b91b66245370052ec55f4ca653725fb85115.tar.gz forums-1084b91b66245370052ec55f4ca653725fb85115.tar.bz2 forums-1084b91b66245370052ec55f4ca653725fb85115.tar.xz forums-1084b91b66245370052ec55f4ca653725fb85115.zip | |
Merge pull request #4926 from JoshyPHP/ticket/15348
[ticket/15348] Ignore smilies that are immediately followed by a word
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/textformatter/s9e/factory.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/phpbb/textformatter/s9e/factory.php b/phpBB/phpbb/textformatter/s9e/factory.php index 7719ce5afa..3f2e0ab8cb 100644 --- a/phpBB/phpbb/textformatter/s9e/factory.php +++ b/phpBB/phpbb/textformatter/s9e/factory.php @@ -323,6 +323,9 @@ class factory implements \phpbb\textformatter\cache_interface // Only parse emoticons at the beginning of the text or if they're preceded by any // one of: a new line, a space, a dot, or a right square bracket $configurator->Emoticons->notAfter = '[^\\n .\\]]'; + + // Ignore emoticons that are immediately followed by a "word" character + $configurator->Emoticons->notBefore = '\\w'; } // Load the censored words |