[ticket/11768] Moved parser/renderer setup events

Moved down the setup events to make them happen after the service is
configured and ready to be used

PHPBB3-11768
This commit is contained in:
JoshyPHP 2015-03-26 18:32:13 +01:00
parent c1bc05a860
commit 0f30301a0c
2 changed files with 11 additions and 11 deletions

View file

@ -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;
}
/**

View file

@ -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;
}
/**