From 38f36882177d25e58d5de41060d51f869a20f8d5 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 4 Dec 2015 14:03:43 +0100
Subject: [PATCH] [ticket/13454] Fix a few issues introduced by overdeleting
 stuff

PHPBB3-13454
---
 phpBB/phpbb/textformatter/s9e/parser.php   | 4 ++++
 phpBB/phpbb/textformatter/s9e/renderer.php | 3 +++
 phpBB/phpbb/user.php                       | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

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
 		*
diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php
index 394cfc0aba..5262e10e87 100644
--- a/phpBB/phpbb/user.php
+++ b/phpBB/phpbb/user.php
@@ -281,7 +281,7 @@ class user extends \phpbb\session
 		// User has wrong style
 		if (!$this->style && $style_id == $this->data['user_style'])
 		{
-			$this->data['user_style'] = $config['default_style'];
+			$style_id = $this->data['user_style'] = $config['default_style'];
 
 			$sql = 'UPDATE ' . USERS_TABLE . "
 				SET user_style = $style_id