diff options
| author | David King <imkingdavid@gmail.com> | 2012-11-15 14:48:45 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2012-11-16 17:05:46 -0500 |
| commit | 8e480a87253fd2e42af3fc4daaed2f49b9ae65c5 (patch) | |
| tree | d9f87d5d27f116c8d9cae51b93226475bd5f96d0 | |
| parent | db1d49d559a337f7266a9e9f0cfaf3eb025b0ed1 (diff) | |
| download | forums-8e480a87253fd2e42af3fc4daaed2f49b9ae65c5.tar forums-8e480a87253fd2e42af3fc4daaed2f49b9ae65c5.tar.gz forums-8e480a87253fd2e42af3fc4daaed2f49b9ae65c5.tar.bz2 forums-8e480a87253fd2e42af3fc4daaed2f49b9ae65c5.tar.xz forums-8e480a87253fd2e42af3fc4daaed2f49b9ae65c5.zip | |
[feature/controller] Move include to app.php
PHPBB3-10864
| -rw-r--r-- | phpBB/app.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/event/kernel_request_subscriber.php | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/phpBB/app.php b/phpBB/app.php index 9ff9069104..a2dbb1ae5b 100644 --- a/phpBB/app.php +++ b/phpBB/app.php @@ -17,6 +17,7 @@ define('IN_PHPBB', true); $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './'; $phpEx = substr(strrchr(__FILE__, '.'), 1); include($phpbb_root_path . 'common.' . $phpEx); +include($this->root_path . 'includes/functions_url_matcher' . $this->php_ext); // Start session management $user->session_begin(); diff --git a/phpBB/includes/event/kernel_request_subscriber.php b/phpBB/includes/event/kernel_request_subscriber.php index 85c8c5b173..afb8464f80 100644 --- a/phpBB/includes/event/kernel_request_subscriber.php +++ b/phpBB/includes/event/kernel_request_subscriber.php @@ -69,12 +69,7 @@ class phpbb_event_kernel_request_subscriber implements EventSubscriberInterface $context = new RequestContext(); $context->fromRequest($request); - if (!function_exists('phpbb_load_url_matcher')) - { - include($this->root_path . 'includes/functions_url_matcher' . $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); } |