diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-10-27 12:16:12 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-10-27 12:16:12 -0700 |
| commit | decabb62c0a6cecd80ecfc54bd0637fa9a446a0e (patch) | |
| tree | e49ad5c85411dc6ff2048ff67fccf7137062c765 | |
| parent | 51251293abb40e04e290df2f937504cfaabde43b (diff) | |
| parent | 47759eb09649bbd4893cc926bf1782cd99674700 (diff) | |
| download | forums-decabb62c0a6cecd80ecfc54bd0637fa9a446a0e.tar forums-decabb62c0a6cecd80ecfc54bd0637fa9a446a0e.tar.gz forums-decabb62c0a6cecd80ecfc54bd0637fa9a446a0e.tar.bz2 forums-decabb62c0a6cecd80ecfc54bd0637fa9a446a0e.tar.xz forums-decabb62c0a6cecd80ecfc54bd0637fa9a446a0e.zip | |
Merge pull request #3079 from nickvergessen/ticket/13230
[ticket/13230] Add missing globals and missing request object for path helper
| -rw-r--r-- | phpBB/includes/functions_compatibility.php | 7 |
1 files changed, 5 insertions, 2 deletions
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 ); |