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/phpbb/template | |
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/phpbb/template')
-rw-r--r-- | phpBB/phpbb/template/twig/environment.php | 4 |
1 files changed, 2 insertions, 2 deletions
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; |