diff options
| author | JoshyPHP <s9e.dev@gmail.com> | 2015-02-23 19:35:49 +0100 |
|---|---|---|
| committer | JoshyPHP <s9e.dev@gmail.com> | 2015-04-02 19:16:02 +0200 |
| commit | 5fe74cd3944387831fb1949198409481a1358ee5 (patch) | |
| tree | 3e2fccbd86356000c17740de736bf6e60ae12594 /phpBB/phpbb/textformatter | |
| parent | 73ce09b73a97e351197005ac89113d3451b41da0 (diff) | |
| download | forums-5fe74cd3944387831fb1949198409481a1358ee5.tar forums-5fe74cd3944387831fb1949198409481a1358ee5.tar.gz forums-5fe74cd3944387831fb1949198409481a1358ee5.tar.bz2 forums-5fe74cd3944387831fb1949198409481a1358ee5.tar.xz forums-5fe74cd3944387831fb1949198409481a1358ee5.zip | |
[ticket/11768] Updated censor to apply to XML values
PHPBB3-11768
Diffstat (limited to 'phpBB/phpbb/textformatter')
| -rw-r--r-- | phpBB/phpbb/textformatter/s9e/renderer.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/phpbb/textformatter/s9e/renderer.php b/phpBB/phpbb/textformatter/s9e/renderer.php index 3ccb40cc2d..54382d7d1e 100644 --- a/phpBB/phpbb/textformatter/s9e/renderer.php +++ b/phpBB/phpbb/textformatter/s9e/renderer.php @@ -168,13 +168,14 @@ class renderer extends \phpbb\textformatter\renderer */ public function render($text) { - $html = $this->renderer->render($text); - if (isset($this->censor) && $this->viewcensors) { - $html = $this->censor->censorHtml($html, true); + // NOTE: censorHtml() is XML-safe + $text = $this->censor->censorHtml($text, true); } + $html = $this->renderer->render($text); + /** * @see bbcode::bbcode_second_pass_code() */ |