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);
 	}