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

Merge pull request #2092 from nickvergessen/ticket/12090

Browse Source 
[ticket/12090] Pass route name to url() instead of the url itself
This commit is contained in:
Nathan Guse
2014-03-10 20:50:08 -05:00
parent 235f7c3721 0119a21862
commit f7020fb5d1
21 changed files with 305 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/includes/functions_url_matcher.php
View File

@@ -53,8 +53,8 @@ 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($root_path);
$provider = new \phpbb\controller\provider($finder);
$routes = $provider->find($root_path)->get_routes();
$dumper = new PhpMatcherDumper($routes);
$cached_url_matcher_dump = $dumper->dump(array(
'class' => 'phpbb_url_matcher',
@@ -72,8 +72,8 @@ function phpbb_create_dumped_url_matcher(\phpbb\extension\finder $finder, $root_
*/
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($root_path);
$provider = new \phpbb\controller\provider($finder);
$routes = $provider->find($root_path)->get_routes();
return new UrlMatcher($routes, $context);
}