diff options
| author | rxu <rxu@mail.ru> | 2017-04-16 20:53:59 +0700 |
|---|---|---|
| committer | rxu <rxu@mail.ru> | 2017-04-16 23:40:16 +0700 |
| commit | fcc8e155ec309669bebbf6e0370cecfe64c95193 (patch) | |
| tree | 99bdec140f08170e7de71febb0393adf25a4c1ec /phpBB | |
| parent | 1ea114ca20bd4613420284d7bfc4c92ab0a817b4 (diff) | |
| download | forums-fcc8e155ec309669bebbf6e0370cecfe64c95193.tar forums-fcc8e155ec309669bebbf6e0370cecfe64c95193.tar.gz forums-fcc8e155ec309669bebbf6e0370cecfe64c95193.tar.bz2 forums-fcc8e155ec309669bebbf6e0370cecfe64c95193.tar.xz forums-fcc8e155ec309669bebbf6e0370cecfe64c95193.zip | |
[ticket/14990] Move dispatcher object to the front of the options array
PHPBB3-14990
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/config/default/container/services_twig.yml | 2 | ||||
| -rw-r--r-- | phpBB/config/installer/container/services.yml | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/template/twig/environment.php | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/config/default/container/services_twig.yml b/phpBB/config/default/container/services_twig.yml index 132b1a3df8..a9b5b6d4cd 100644 --- a/phpBB/config/default/container/services_twig.yml +++ b/phpBB/config/default/container/services_twig.yml @@ -11,8 +11,8 @@ services: - '%core.template.cache_path%' - '@ext.manager' - '@template.twig.loader' - - [] - '@dispatcher' + - [] calls: - [setLexer, ['@template.twig.lexer']] diff --git a/phpBB/config/installer/container/services.yml b/phpBB/config/installer/container/services.yml index 7bab8f7835..7203c0ab10 100644 --- a/phpBB/config/installer/container/services.yml +++ b/phpBB/config/installer/container/services.yml @@ -84,8 +84,8 @@ services: - '%core.template.cache_path%' - null - '@template.twig.loader' - - [] - null + - [] calls: - [setLexer, ['@template.twig.lexer']] diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 983cc91688..802246c1c5 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -672,8 +672,8 @@ class messenger new \phpbb\template\twig\loader( $phpbb_container->get('filesystem') ), - array(), - $phpbb_dispatcher + $phpbb_dispatcher, + array() ); $template_environment->setLexer($phpbb_container->get('template.twig.lexer')); diff --git a/phpBB/phpbb/template/twig/environment.php b/phpBB/phpbb/template/twig/environment.php index d9e84b042e..ac4b16e457 100644 --- a/phpBB/phpbb/template/twig/environment.php +++ b/phpBB/phpbb/template/twig/environment.php @@ -56,10 +56,10 @@ class environment extends \Twig_Environment * @param string $cache_path The path to the cache directory * @param \phpbb\extension\manager $extension_manager phpBB extension manager * @param \Twig_LoaderInterface $loader Twig loader interface - * @param array $options Array of options to pass to Twig * @param \phpbb\event\dispatcher_interface $phpbb_dispatcher Event dispatcher object + * @param array $options Array of options to pass to Twig */ - public function __construct(\phpbb\config\config $phpbb_config, \phpbb\filesystem\filesystem $filesystem, \phpbb\path_helper $path_helper, $cache_path, \phpbb\extension\manager $extension_manager = null, \Twig_LoaderInterface $loader = null, $options = array(), \phpbb\event\dispatcher_interface $phpbb_dispatcher = null) + public function __construct(\phpbb\config\config $phpbb_config, \phpbb\filesystem\filesystem $filesystem, \phpbb\path_helper $path_helper, $cache_path, \phpbb\extension\manager $extension_manager = null, \Twig_LoaderInterface $loader = null, \phpbb\event\dispatcher_interface $phpbb_dispatcher = null, $options = array()) { $this->phpbb_config = $phpbb_config; |