mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x' into 3.3.x

Browse Source
This commit is contained in:
Marc Alexander
2019-09-22 12:05:05 +02:00
parent 1ef43bc1a1 53aa79cd29
commit 9454377e55
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/phpbb/filesystem/filesystem.php
View File

@@ -835,7 +835,7 @@ class filesystem implements filesystem_interface
$current_path = $resolved_path . '/' . $path_part; $current_path = $resolved_path . '/' . $path_part;
// Resolve symlinks // Resolve symlinks
if (is_link($current_path)) if (@is_link($current_path))
{ {
if (!function_exists('readlink')) if (!function_exists('readlink'))
{ {
@@ -872,12 +872,12 @@ class filesystem implements filesystem_interface
$resolved_path = false; $resolved_path = false;
} }
else if (is_dir($current_path . '/')) else if (@is_dir($current_path . '/'))
{ {
$resolved[] = $path_part; $resolved[] = $path_part;
$resolved_path = $current_path; $resolved_path = $current_path;
} }
else if (is_file($current_path)) else if (@is_file($current_path))
{ {
$resolved[] = $path_part; $resolved[] = $path_part;
$resolved_path = $current_path; $resolved_path = $current_path;