diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-12-04 14:03:43 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-01-06 13:52:11 +0100 |
| commit | 38f36882177d25e58d5de41060d51f869a20f8d5 (patch) | |
| tree | d396575f0756259abee04d523cb176324421d653 /phpBB | |
| parent | 266576c6a4224f4b803040c678020e825a1510b5 (diff) | |
| download | forums-38f36882177d25e58d5de41060d51f869a20f8d5.tar forums-38f36882177d25e58d5de41060d51f869a20f8d5.tar.gz forums-38f36882177d25e58d5de41060d51f869a20f8d5.tar.bz2 forums-38f36882177d25e58d5de41060d51f869a20f8d5.tar.xz forums-38f36882177d25e58d5de41060d51f869a20f8d5.zip | |
[ticket/13454] Fix a few issues introduced by overdeleting stuff
PHPBB3-13454
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/textformatter/s9e/parser.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/textformatter/s9e/renderer.php | 3 | ||||
| -rw-r--r-- | phpBB/phpbb/user.php | 2 |
3 files changed, 8 insertions, 1 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 * 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 |