1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-14 12:40:13 +01:00

[feature/controller] Move include to app.php

PHPBB3-10864
This commit is contained in:
David King 2012-11-15 14:48:45 -05:00
parent db1d49d559
commit 8e480a8725
2 changed files with 1 additions and 5 deletions

View File

@ -17,6 +17,7 @@ define('IN_PHPBB', true);
$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './'; $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './';
$phpEx = substr(strrchr(__FILE__, '.'), 1); $phpEx = substr(strrchr(__FILE__, '.'), 1);
include($phpbb_root_path . 'common.' . $phpEx); include($phpbb_root_path . 'common.' . $phpEx);
include($this->root_path . 'includes/functions_url_matcher' . $this->php_ext);
// Start session management // Start session management
$user->session_begin(); $user->session_begin();

View File

@ -69,12 +69,7 @@ class phpbb_event_kernel_request_subscriber implements EventSubscriberInterface
$context = new RequestContext(); $context = new RequestContext();
$context->fromRequest($request); $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); $matcher = phpbb_get_url_matcher($this->finder, $context, $this->root_path, $this->php_ext);
$router_listener = new RouterListener($matcher, $context); $router_listener = new RouterListener($matcher, $context);
$router_listener->onKernelRequest($event); $router_listener->onKernelRequest($event);
} }