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()
 		*/