[ticket/13454] Fix a few issues introduced by overdeleting stuff

PHPBB3-13454
This commit is contained in:
Marc Alexander 2015-12-04 14:03:43 +01:00
parent 266576c6a4
commit 38f3688217
3 changed files with 8 additions and 1 deletions

View file

@ -51,6 +51,8 @@ class parser implements \phpbb\textformatter\parser_interface
$this->dispatcher = $dispatcher; $this->dispatcher = $dispatcher;
$this->parser = $parser; $this->parser = $parser;
$parser = $this;
/** /**
* Configure the parser service * Configure the parser service
* *
@ -72,6 +74,8 @@ class parser implements \phpbb\textformatter\parser_interface
*/ */
public function parse($text) public function parse($text)
{ {
$parser = $this;
/** /**
* Modify a text before it is parsed * Modify a text before it is parsed
* *

View file

@ -104,6 +104,7 @@ class renderer implements \phpbb\textformatter\renderer_interface
} }
$this->dispatcher = $dispatcher; $this->dispatcher = $dispatcher;
$this->renderer = $renderer; $this->renderer = $renderer;
$renderer = $this;
/** /**
* Configure the renderer service * Configure the renderer service
@ -233,6 +234,8 @@ class renderer implements \phpbb\textformatter\renderer_interface
$xml = $this->quote_helper->inject_metadata($xml); $xml = $this->quote_helper->inject_metadata($xml);
} }
$renderer = $this;
/** /**
* Modify a parsed text before it is rendered * Modify a parsed text before it is rendered
* *

View file

@ -281,7 +281,7 @@ class user extends \phpbb\session
// User has wrong style // User has wrong style
if (!$this->style && $style_id == $this->data['user_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 . " $sql = 'UPDATE ' . USERS_TABLE . "
SET user_style = $style_id SET user_style = $style_id