mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-08 09:46:46 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1801 from nickvergessen/ticket/11948

Browse Source 
Ticket/11948 Extensions should be allowed to have more then 1 routing file
This commit is contained in:
Nils Adermann
2013-10-22 00:29:20 -07:00
parent ba5b53521a 96317b2c45
commit a7e41b23fd
5 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/includes/functions_url_matcher.php
View File

@@ -32,7 +32,7 @@ function phpbb_get_url_matcher(\phpbb\extension\finder $finder, RequestContext $
{
if (defined('DEBUG'))
{
return phpbb_create_url_matcher($finder, $context);
return phpbb_create_url_matcher($finder, $context, $root_path);
}
if (!phpbb_url_matcher_dumped($root_path, $php_ext))
@@ -54,7 +54,7 @@ function phpbb_get_url_matcher(\phpbb\extension\finder $finder, RequestContext $
function phpbb_create_dumped_url_matcher(\phpbb\extension\finder $finder, $root_path, $php_ext)
{
$provider = new \phpbb\controller\provider();
$routes = $provider->import_paths_from_finder($finder)->find();
$routes = $provider->import_paths_from_finder($finder)->find($root_path);
$dumper = new PhpMatcherDumper($routes);
$cached_url_matcher_dump = $dumper->dump(array(
'class' => 'phpbb_url_matcher',
@@ -70,10 +70,10 @@ function phpbb_create_dumped_url_matcher(\phpbb\extension\finder $finder, $root_
* @param RequestContext $context Symfony RequestContext object
* @return UrlMatcher
*/
function phpbb_create_url_matcher(\phpbb\extension\finder $finder, RequestContext $context)
function phpbb_create_url_matcher(\phpbb\extension\finder $finder, RequestContext $context, $root_path)
{
$provider = new \phpbb\controller\provider();
$routes = $provider->import_paths_from_finder($finder)->find();
$routes = $provider->import_paths_from_finder($finder)->find($root_path);
return new UrlMatcher($routes, $context);
}