From 47759eb09649bbd4893cc926bf1782cd99674700 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 27 Oct 2014 14:54:17 +0100 Subject: [ticket/13230] Add missing globals and missing request object for path helper PHPBB3-13230 --- phpBB/includes/functions_compatibility.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'phpBB/includes/functions_compatibility.php') diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php index fbb1f0e03d..43952ae57a 100644 --- a/phpBB/includes/functions_compatibility.php +++ b/phpBB/includes/functions_compatibility.php @@ -101,18 +101,21 @@ function phpbb_clean_path($path) } else if (!$phpbb_path_helper) { + global $phpbb_root_path, $phpEx; + // The container is not yet loaded, use a new instance if (!class_exists('\phpbb\path_helper')) { - global $phpbb_root_path, $phpEx; require($phpbb_root_path . 'phpbb/path_helper.' . $phpEx); } + $request = new phpbb\request\request(); $phpbb_path_helper = new phpbb\path_helper( new phpbb\symfony_request( - new phpbb\request\request() + $request ), new phpbb\filesystem(), + $request, $phpbb_root_path, $phpEx ); -- cgit v1.2.1