diff options
| author | JoshyPHP <s9e.dev@gmail.com> | 2017-01-14 14:27:38 +0100 |
|---|---|---|
| committer | JoshyPHP <s9e.dev@gmail.com> | 2017-01-14 14:27:38 +0100 |
| commit | 15315ac87a68834e2d560acf62756f628a26da45 (patch) | |
| tree | c2db5de0b12257fe6fb1d57f9189ebf73bf43d19 /phpBB/phpbb/textformatter | |
| parent | 26c6cb819eea5fe67d5df7b0af3f580848b953b6 (diff) | |
| download | forums-15315ac87a68834e2d560acf62756f628a26da45.tar forums-15315ac87a68834e2d560acf62756f628a26da45.tar.gz forums-15315ac87a68834e2d560acf62756f628a26da45.tar.bz2 forums-15315ac87a68834e2d560acf62756f628a26da45.tar.xz forums-15315ac87a68834e2d560acf62756f628a26da45.zip | |
[ticket/15008] Disable emoji when smilies are disabled
Will effectively disable emoji shortname and won't replace emoji
with images but will not prevent a browser or OS from displaying
emoji as images.
PHPBB3-15008
Diffstat (limited to 'phpBB/phpbb/textformatter')
| -rw-r--r-- | phpBB/phpbb/textformatter/s9e/parser.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php index e2653d60f0..05ddfffa11 100644 --- a/phpBB/phpbb/textformatter/s9e/parser.php +++ b/phpBB/phpbb/textformatter/s9e/parser.php @@ -142,6 +142,7 @@ class parser implements \phpbb\textformatter\parser_interface public function disable_smilies() { $this->parser->disablePlugin('Emoticons'); + $this->parser->disablePlugin('Emoji'); } /** @@ -183,6 +184,7 @@ class parser implements \phpbb\textformatter\parser_interface public function enable_smilies() { $this->parser->enablePlugin('Emoticons'); + $this->parser->enablePlugin('Emoji'); } /** |