aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/textformatter
diff options
context:
space:
mode:
authorJoshyPHP <s9e.dev@gmail.com>2015-02-23 19:34:10 +0100
committerJoshyPHP <s9e.dev@gmail.com>2015-04-02 19:16:02 +0200
commit73ce09b73a97e351197005ac89113d3451b41da0 (patch)
tree396dc484fad15de139e8851e358bd1d2f75dfc77 /phpBB/phpbb/textformatter
parentc1ba3a678d5a565b74d893c57eb5133623702350 (diff)
downloadforums-73ce09b73a97e351197005ac89113d3451b41da0.tar
forums-73ce09b73a97e351197005ac89113d3451b41da0.tar.gz
forums-73ce09b73a97e351197005ac89113d3451b41da0.tar.bz2
forums-73ce09b73a97e351197005ac89113d3451b41da0.tar.xz
forums-73ce09b73a97e351197005ac89113d3451b41da0.zip
[ticket/11768] Fixed censored words being escaped twice
PHPBB3-11768
Diffstat (limited to 'phpBB/phpbb/textformatter')
-rw-r--r--phpBB/phpbb/textformatter/s9e/factory.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/phpbb/textformatter/s9e/factory.php b/phpBB/phpbb/textformatter/s9e/factory.php
index a6639976c4..9af34ab90a 100644
--- a/phpBB/phpbb/textformatter/s9e/factory.php
+++ b/phpBB/phpbb/textformatter/s9e/factory.php
@@ -274,7 +274,8 @@ class factory implements \phpbb\textformatter\cache
$configurator->plugins->load('Censor', array('tagName' => 'censor:tag'));
foreach ($censor as $row)
{
- $configurator->Censor->add($row['word'], $row['replacement']);
+ // 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']));
}
}