diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2014-03-10 20:50:08 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2014-03-10 20:50:08 -0500 |
| commit | f7020fb5d1368020cf780deaeba56fee56e3dcfa (patch) | |
| tree | 66f95cb75cf7c892c9ccebc830a654c3a896086e /phpBB/includes | |
| parent | 235f7c3721f792e0f732ed086e1118a2f08e37a6 (diff) | |
| parent | 0119a21862bc433b50fe3914e3bae6f12f61129c (diff) | |
| download | forums-f7020fb5d1368020cf780deaeba56fee56e3dcfa.tar forums-f7020fb5d1368020cf780deaeba56fee56e3dcfa.tar.gz forums-f7020fb5d1368020cf780deaeba56fee56e3dcfa.tar.bz2 forums-f7020fb5d1368020cf780deaeba56fee56e3dcfa.tar.xz forums-f7020fb5d1368020cf780deaeba56fee56e3dcfa.zip | |
Merge pull request #2092 from nickvergessen/ticket/12090
[ticket/12090] Pass route name to url() instead of the url itself
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_url_matcher.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions_url_matcher.php b/phpBB/includes/functions_url_matcher.php index c5d6815119..8e5ae20f93 100644 --- a/phpBB/includes/functions_url_matcher.php +++ b/phpBB/includes/functions_url_matcher.php @@ -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); } |