diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-08 16:32:43 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-08 16:37:22 +0100 |
| commit | 07c07171f9b70a49b592473b8a8400d3838333a3 (patch) | |
| tree | 0dbacc6b1f177c47e99b0be122a42ccf51f510f3 /phpBB/phpbb/controller/helper.php | |
| parent | 275910d8b0fd8d5edeee07eb05ad82da48cc72a3 (diff) | |
| download | forums-07c07171f9b70a49b592473b8a8400d3838333a3.tar forums-07c07171f9b70a49b592473b8a8400d3838333a3.tar.gz forums-07c07171f9b70a49b592473b8a8400d3838333a3.tar.bz2 forums-07c07171f9b70a49b592473b8a8400d3838333a3.tar.xz forums-07c07171f9b70a49b592473b8a8400d3838333a3.zip | |
[ticket/12090] Make provider a service and inject it into the helper
PHPBB3-12090
Diffstat (limited to 'phpBB/phpbb/controller/helper.php')
| -rw-r--r-- | phpBB/phpbb/controller/helper.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index daa52ec672..c97e0883f4 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -58,16 +58,14 @@ class helper * @param string $phpbb_root_path phpBB root path * @param string $php_ext PHP extension */ - public function __construct(\phpbb\extension\finder $finder, \phpbb\template\template $template, \phpbb\user $user, \phpbb\config\config $config, $phpbb_root_path, $php_ext) + public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\config\config $config, \phpbb\controller\provider $provider, $phpbb_root_path, $php_ext) { $this->template = $template; $this->user = $user; $this->config = $config; $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; - - $provider = new \phpbb\controller\provider(); - $this->route_collection = $provider->import_paths_from_finder($finder)->find($this->phpbb_root_path); + $this->route_collection = $provider->find($this->phpbb_root_path); } |