diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-01-15 00:25:28 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-01-15 00:25:28 +0100 |
| commit | 42e78004fbe9cce9a77f718a281d95b2c9b1e5d2 (patch) | |
| tree | b03c18978b7c83bd548a4c44cef9073ddacee991 /phpBB/phpbb/textformatter | |
| parent | b72df1f384c778c9e54d1aa74600142e224c18e6 (diff) | |
| parent | 15315ac87a68834e2d560acf62756f628a26da45 (diff) | |
| download | forums-42e78004fbe9cce9a77f718a281d95b2c9b1e5d2.tar forums-42e78004fbe9cce9a77f718a281d95b2c9b1e5d2.tar.gz forums-42e78004fbe9cce9a77f718a281d95b2c9b1e5d2.tar.bz2 forums-42e78004fbe9cce9a77f718a281d95b2c9b1e5d2.tar.xz forums-42e78004fbe9cce9a77f718a281d95b2c9b1e5d2.zip | |
Merge pull request #4643 from JoshyPHP/ticket/15008
[ticket/15008] Disable emoji when smilies are disabled
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'); } /** |