mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-17 13:00:20 +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
commit d882911bf5
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
4 changed files with 22 additions and 0 deletions
Show Stats 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() public function disable_smilies()
{ {
$this->parser->disablePlugin('Emoticons'); $this->parser->disablePlugin('Emoticons');
$this->parser->disablePlugin('Emoji');
} }
/** /**
@ -183,6 +184,7 @@ class parser implements \phpbb\textformatter\parser_interface
public function enable_smilies() public function enable_smilies()
{ {
$this->parser->enablePlugin('Emoticons'); $this->parser->enablePlugin('Emoticons');
$this->parser->enablePlugin('Emoji');
} }
/** /**

18
tests/text_processing/tickets_data/PHPBB3-15008.before.php Normal file
View File

@ -0,0 +1,18 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
function before_assert_phpbb3_15008($vars)
{
extract($vars);
$parser->disable_smilies();
}

1
tests/text_processing/tickets_data/PHPBB3-15008.html Normal file
View File

@ -0,0 +1 @@
No smilies :) or shortnames :strawberry:

1
tests/text_processing/tickets_data/PHPBB3-15008.txt Normal file
View File

@ -0,0 +1 @@
No smilies :) or shortnames :strawberry: