diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-10-27 12:25:41 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-10-27 12:25:41 -0700 |
| commit | b1d738607563d0bc43bc7e93f81165a3bed6bfa8 (patch) | |
| tree | 2d58634cab7759b002eb5d71737dce92c427c801 /phpBB/includes | |
| parent | 222bec0204fa600bd72df3bba8fc45131af41c83 (diff) | |
| parent | d693d91e26e3200916b0f7fd475de1e968a43fee (diff) | |
| download | forums-b1d738607563d0bc43bc7e93f81165a3bed6bfa8.tar forums-b1d738607563d0bc43bc7e93f81165a3bed6bfa8.tar.gz forums-b1d738607563d0bc43bc7e93f81165a3bed6bfa8.tar.bz2 forums-b1d738607563d0bc43bc7e93f81165a3bed6bfa8.tar.xz forums-b1d738607563d0bc43bc7e93f81165a3bed6bfa8.zip | |
Merge branch 'prep-release-3.1.0' into develop-ascraeus
* prep-release-3.1.0:
[ticket/13230] Add missing globals and missing request object for path helper
[ticket/13226] Add functional test for group ranks
[ticket/13226] Fix the usage of $rank_img
Diffstat (limited to 'phpBB/includes')
| -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 ); |