diff options
| author | David King <imkingdavid@gmail.com> | 2012-11-14 16:42:52 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2012-11-16 17:05:43 -0500 |
| commit | fa43edd8778dffd21146350f1749fad5c0755fb7 (patch) | |
| tree | 7e119560952c9120a4fbb203246d3c2dae6a7598 /phpBB/includes/event/kernel_request_subscriber.php | |
| parent | 4cb9ec522c7007b99eb5ef44cb1bfdb369478aff (diff) | |
| download | forums-fa43edd8778dffd21146350f1749fad5c0755fb7.tar forums-fa43edd8778dffd21146350f1749fad5c0755fb7.tar.gz forums-fa43edd8778dffd21146350f1749fad5c0755fb7.tar.bz2 forums-fa43edd8778dffd21146350f1749fad5c0755fb7.tar.xz forums-fa43edd8778dffd21146350f1749fad5c0755fb7.zip | |
[feature/controller] Further separate url matcher functionality
PHPBB3-10864
Diffstat (limited to 'phpBB/includes/event/kernel_request_subscriber.php')
| -rw-r--r-- | phpBB/includes/event/kernel_request_subscriber.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/includes/event/kernel_request_subscriber.php b/phpBB/includes/event/kernel_request_subscriber.php index 98079acabb..85c8c5b173 100644 --- a/phpBB/includes/event/kernel_request_subscriber.php +++ b/phpBB/includes/event/kernel_request_subscriber.php @@ -50,8 +50,6 @@ class phpbb_event_kernel_request_subscriber implements EventSubscriberInterface */ public function __construct(phpbb_extension_finder $finder, $root_path, $php_ext) { - $this->template = $template; - $this->user = $user; $this->finder = $finder; $this->root_path = $root_path; $this->php_ext = $php_ext; @@ -71,11 +69,11 @@ class phpbb_event_kernel_request_subscriber implements EventSubscriberInterface $context = new RequestContext(); $context->fromRequest($request); - if (!function_exists('phpbb_create_url_matcher')) + if (!function_exists('phpbb_load_url_matcher')) { include($this->root_path . 'includes/functions_url_matcher' . $this->php_ext); } - $matcher = phpbb_create_url_matcher($this->finder, $context, $this->root_path, $this->php_ext); + $matcher = phpbb_get_url_matcher($this->finder, $context, $this->root_path, $this->php_ext); $router_listener = new RouterListener($matcher, $context); $router_listener->onKernelRequest($event); |