diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-07-16 17:33:34 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-07-16 17:33:34 +0200 |
| commit | 337c8451e750fe89b9a8eb0b461db1a5699ca005 (patch) | |
| tree | e134276e33e1b5509508c5c603a20015cee672e1 /phpBB/phpbb/textformatter/s9e | |
| parent | 4b733426698760801ff2b8ce3ce077c16732d4ef (diff) | |
| parent | 329e5c5e052588b0f22c9046b9fbc19c9e551c81 (diff) | |
| download | forums-337c8451e750fe89b9a8eb0b461db1a5699ca005.tar forums-337c8451e750fe89b9a8eb0b461db1a5699ca005.tar.gz forums-337c8451e750fe89b9a8eb0b461db1a5699ca005.tar.bz2 forums-337c8451e750fe89b9a8eb0b461db1a5699ca005.tar.xz forums-337c8451e750fe89b9a8eb0b461db1a5699ca005.zip | |
Merge pull request #4865 from JoshyPHP/ticket/15261
[ticket/15261] Fix censoring HTML tags
Diffstat (limited to 'phpBB/phpbb/textformatter/s9e')
| -rw-r--r-- | phpBB/phpbb/textformatter/s9e/renderer.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/phpbb/textformatter/s9e/renderer.php b/phpBB/phpbb/textformatter/s9e/renderer.php index 9be20b7f53..6fcd2b0a98 100644 --- a/phpBB/phpbb/textformatter/s9e/renderer.php +++ b/phpBB/phpbb/textformatter/s9e/renderer.php @@ -247,14 +247,12 @@ class renderer implements \phpbb\textformatter\renderer_interface $vars = array('renderer', 'xml'); extract($this->dispatcher->trigger_event('core.text_formatter_s9e_render_before', compact($vars))); + $html = $this->renderer->render($xml); if (isset($this->censor) && $this->viewcensors) { - // NOTE: censorHtml() is XML-safe - $xml = $this->censor->censorHtml($xml, true); + $html = $this->censor->censorHtml($html, true); } - $html = $this->renderer->render($xml); - /** * Modify a rendered text * |