mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/11497] Remove 'ext.finder' from services' list

Browse Source 
PHPBB3-11497
This commit is contained in:
Nicofuma
2014-05-02 23:03:03 +02:00
parent 3b823465db
commit dc6e2be884
8 changed files with 62 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
phpBB/phpbb/controller/provider.php
View File

@@ -37,20 +37,24 @@ class provider
* @param array() $routing_files Array of strings containing paths
* to YAML files holding route information
*/
public function __construct(\phpbb\extension\finder $finder = null, $routing_files = array())
public function __construct($routing_files = array())
{
$this->routing_files = $routing_files;
}
if ($finder)
{
// We hardcode the path to the core config directory
// because the finder cannot find it
$this->routing_files = array_merge($this->routing_files, array('config/routing.yml'), array_keys($finder
->directory('/config')
->suffix('routing.yml')
->find()
));
}
/**
* @param \phpbb\extension\finder $finder
* @return null
*/
public function set_ext_finder(\phpbb\extension\finder $finder)
{
// We hardcode the path to the core config directory
// because the finder cannot find it
$this->routing_files = array_merge($this->routing_files, array('config/routing.yml'), array_keys($finder
->directory('config')
->suffix('routing.yml')
->find()
));
}
/**