diff options
Diffstat (limited to 'phpBB/phpbb/session.php')
| -rw-r--r-- | phpBB/phpbb/session.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 6851bc8188..cdadf2e389 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -13,6 +13,8 @@ namespace phpbb; +use phpbb\filesystem\helper as filesystem_helper; + /** * Session class */ @@ -38,7 +40,7 @@ class session */ static function extract_current_page($root_path) { - global $request, $symfony_request, $phpbb_filesystem; + global $request, $symfony_request; $page_array = array(); @@ -85,7 +87,7 @@ class session $page_name = (substr($script_name, -1, 1) == '/') ? '' : basename($script_name); $page_name = urlencode(htmlspecialchars($page_name)); - $symfony_request_path = $phpbb_filesystem->clean_path($symfony_request->getPathInfo()); + $symfony_request_path = filesystem_helper::clean_path($symfony_request->getPathInfo()); if ($symfony_request_path !== '/') { $page_name .= str_replace('%2F', '/', urlencode($symfony_request_path)); @@ -99,8 +101,8 @@ class session else { // current directory within the phpBB root (for example: adm) - $root_dirs = explode('/', str_replace('\\', '/', $phpbb_filesystem->realpath($root_path))); - $page_dirs = explode('/', str_replace('\\', '/', $phpbb_filesystem->realpath('./'))); + $root_dirs = explode('/', str_replace('\\', '/', filesystem_helper::realpath($root_path))); + $page_dirs = explode('/', str_replace('\\', '/', filesystem_helper::realpath('./'))); } $intersection = array_intersect_assoc($root_dirs, $page_dirs); |