2 files changed, 11 insertions, 11 deletions
diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index f220dd3e64..ab81a0ab4f 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -53,6 +53,10 @@ class parser implements \phpbb\textformatter\parser_interface
 			$objects = $factory->regenerate();
 			$parser  = $objects['parser'];
 		}
+
+		$this->dispatcher = $dispatcher;
+		$this->parser = $parser;
+		$this->user = $user;
 		$self = $this;
 
 		/**
@@ -72,10 +76,6 @@ class parser implements \phpbb\textformatter\parser_interface
 		*/
 		$vars = array('parser', 'self', 'user');
 		extract($dispatcher->trigger_event('core.text_formatter_s9e_parser_setup', compact($vars)));
-
-		$this->dispatcher = $dispatcher;
-		$this->parser = $parser;
-		$this->user = $user;
 	}
 
 	/**
diff --git a/phpBB/phpbb/textformatter/s9e/renderer.php b/phpBB/phpbb/textformatter/s9e/renderer.php
index 272cc5e6f3..28498150b3 100644
--- a/phpBB/phpbb/textformatter/s9e/renderer.php
+++ b/phpBB/phpbb/textformatter/s9e/renderer.php
@@ -92,6 +92,13 @@ class renderer implements \phpbb\textformatter\renderer_interface
 			$objects  = $factory->regenerate();
 			$renderer = $objects['renderer'];
 		}
+
+		if (isset($censor))
+		{
+			$this->censor = $censor;
+		}
+		$this->dispatcher = $dispatcher;
+		$this->renderer = $renderer;
 		$self = $this;
 
 		/**
@@ -104,13 +111,6 @@ class renderer implements \phpbb\textformatter\renderer_interface
 		*/
 		$vars = array('renderer', 'self');
 		extract($dispatcher->trigger_event('core.text_formatter_s9e_renderer_setup', compact($vars)));
-
-		if (isset($censor))
-		{
-			$this->censor = $censor;
-		}
-		$this->dispatcher = $dispatcher;
-		$this->renderer = $renderer;
 	}
 
 	/**