aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/textformatter/s9e
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2017-01-15 12:08:01 +0100
committerTristan Darricau <github@nicofuma.fr>2017-01-15 12:08:01 +0100
commit2637606ae1b033c12a34efd946dac145a679945f (patch)
treecf4aa932bc638ad62b1b84e90ef5468914e625d1 /phpBB/phpbb/textformatter/s9e
parentd6e42ec63b54c54b488d3e4112f4cd83062731ba (diff)
parent499fcbcca96c154298b355a945897aba4164ab8d (diff)
downloadforums-2637606ae1b033c12a34efd946dac145a679945f.tar
forums-2637606ae1b033c12a34efd946dac145a679945f.tar.gz
forums-2637606ae1b033c12a34efd946dac145a679945f.tar.bz2
forums-2637606ae1b033c12a34efd946dac145a679945f.tar.xz
forums-2637606ae1b033c12a34efd946dac145a679945f.zip
Merge pull request #4631 from JoshyPHP/ticket/14985
[ticket/14985] Decode HTML special chars in plain text columns * JoshyPHP/ticket/14985: [ticket/14985] Added functional tests for BBCodes and smilies [ticket/14985] Decode HTML special chars in plain text columns
Diffstat (limited to 'phpBB/phpbb/textformatter/s9e')
-rw-r--r--phpBB/phpbb/textformatter/s9e/factory.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/phpbb/textformatter/s9e/factory.php b/phpBB/phpbb/textformatter/s9e/factory.php
index 55149b8e63..5cbf2712f7 100644
--- a/phpBB/phpbb/textformatter/s9e/factory.php
+++ b/phpBB/phpbb/textformatter/s9e/factory.php
@@ -333,8 +333,7 @@ class factory implements \phpbb\textformatter\cache_interface
$configurator->plugins->load('Censor', array('tagName' => 'censor:tag'));
foreach ($censor as $row)
{
- // NOTE: words are stored as HTML, we need to decode them to plain text
- $configurator->Censor->add(htmlspecialchars_decode($row['word']), htmlspecialchars_decode($row['replacement']));
+ $configurator->Censor->add($row['word'], $row['replacement']);
}
}