makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-12 22:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3079 from nickvergessen/ticket/13230

Browse source 
[ticket/13230] Add missing globals and missing request object for path helper
This commit is contained in:
Nils Adermann 2014-10-27 12:16:12 -07:00
commit decabb62c0
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/includes/functions_compatibility.php
View file

@ -101,18 +101,21 @@ function phpbb_clean_path($path)
} }
else if (!$phpbb_path_helper) else if (!$phpbb_path_helper)
{ {
global $phpbb_root_path, $phpEx;
// The container is not yet loaded, use a new instance // The container is not yet loaded, use a new instance
if (!class_exists('\phpbb\path_helper')) if (!class_exists('\phpbb\path_helper'))
{ {
global $phpbb_root_path, $phpEx;
require($phpbb_root_path . 'phpbb/path_helper.' . $phpEx); require($phpbb_root_path . 'phpbb/path_helper.' . $phpEx);
} }
$request = new phpbb\request\request();
$phpbb_path_helper = new phpbb\path_helper( $phpbb_path_helper = new phpbb\path_helper(
new phpbb\symfony_request( new phpbb\symfony_request(
new phpbb\request\request() $request
), ),
new phpbb\filesystem(), new phpbb\filesystem(),
$request,
$phpbb_root_path, $phpbb_root_path,
$phpEx $phpEx
); );