2 files changed, 3 insertions, 8 deletions
diff --git a/phpBB/phpbb/textformatter/s9e/factory.php b/phpBB/phpbb/textformatter/s9e/factory.php
index a0817a9a4f..a7cf2d89b8 100644
--- a/phpBB/phpbb/textformatter/s9e/factory.php
+++ b/phpBB/phpbb/textformatter/s9e/factory.php
@@ -314,13 +314,8 @@ class factory implements \phpbb\textformatter\cache
 		// Cache the parser as-is
 		$this->cache->put($this->cache_key_parser, $parser);
 
-		// We need to cache the name of the renderer's generated class so that we can load the class
-		// before the renderer is unserialized. That's why we save them together, with the renderer
-		// in serialized form
-		$renderer_data = array(
-			'class'    => get_class($renderer),
-			'renderer' => serialize($renderer)
-		);
+		// We need to cache the name of the renderer's generated class
+		$renderer_data = array('class' => get_class($renderer));
 		if (isset($censor))
 		{
 			$renderer_data['censor'] = $censor;
diff --git a/phpBB/phpbb/textformatter/s9e/renderer.php b/phpBB/phpbb/textformatter/s9e/renderer.php
index 7b2fef5f4b..71c207e6fc 100644
--- a/phpBB/phpbb/textformatter/s9e/renderer.php
+++ b/phpBB/phpbb/textformatter/s9e/renderer.php
@@ -77,7 +77,7 @@ class renderer extends \phpbb\textformatter\renderer
 
 			if (class_exists($class, false))
 			{
-				$renderer = unserialize($renderer_data['renderer']);
+				$renderer = new $class;
 			}
 
 			if (isset($renderer_data['censor']))