mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Marc Alexander
2017-01-15 00:25:32 +01:00
parent 605fd40914 42e78004fb
commit d882911bf5
4 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/phpbb/textformatter/s9e/parser.php
View File

@@ -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');
}
/**