2 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index 6470bb8245..39e91f037e 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -51,6 +51,8 @@ class parser implements \phpbb\textformatter\parser_interface
 		$this->dispatcher = $dispatcher;
 		$this->parser = $parser;
 
+		$parser = $this;
+
 		/**
 		* Configure the parser service
 		*
@@ -72,6 +74,8 @@ class parser implements \phpbb\textformatter\parser_interface
 	*/
 	public function parse($text)
 	{
+		$parser = $this;
+
 		/**
 		* Modify a text before it is parsed
 		*
diff --git a/phpBB/phpbb/textformatter/s9e/renderer.php b/phpBB/phpbb/textformatter/s9e/renderer.php
index 6ba75d0c04..9be20b7f53 100644
--- a/phpBB/phpbb/textformatter/s9e/renderer.php
+++ b/phpBB/phpbb/textformatter/s9e/renderer.php
@@ -104,6 +104,7 @@ class renderer implements \phpbb\textformatter\renderer_interface
 		}
 		$this->dispatcher = $dispatcher;
 		$this->renderer = $renderer;
+		$renderer = $this;
 
 		/**
 		* Configure the renderer service
@@ -233,6 +234,8 @@ class renderer implements \phpbb\textformatter\renderer_interface
 			$xml = $this->quote_helper->inject_metadata($xml);
 		}
 
+		$renderer = $this;
+
 		/**
 		* Modify a parsed text before it is rendered
 		*