diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-07-16 20:53:18 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-07-16 20:53:18 +0200 |
| commit | 53f186d96bc6dd3c5870201562116e17d008d64b (patch) | |
| tree | 5a3c7950dc56995c495d6662a66a072bf4498913 /phpBB/phpbb/textformatter/s9e | |
| parent | a53c8cee79af4fc76590073ae5913d8159b97679 (diff) | |
| parent | 5216bf44838f8395d27b3df4ec1641a6407cb466 (diff) | |
| download | forums-53f186d96bc6dd3c5870201562116e17d008d64b.tar forums-53f186d96bc6dd3c5870201562116e17d008d64b.tar.gz forums-53f186d96bc6dd3c5870201562116e17d008d64b.tar.bz2 forums-53f186d96bc6dd3c5870201562116e17d008d64b.tar.xz forums-53f186d96bc6dd3c5870201562116e17d008d64b.zip | |
Merge branch 'prep-release-3.2.1' into 3.2.x
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 * |