diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-09-22 12:05:05 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-09-22 12:05:05 +0200 |
| commit | 9454377e55e379f408f8d456fe37b4104894d899 (patch) | |
| tree | bede17c28cb990be3e7a3aaa28b4cc4b371737a7 /phpBB/phpbb/filesystem/filesystem.php | |
| parent | 1ef43bc1a1d9fa643e365701109a9a9542adfe91 (diff) | |
| parent | 53aa79cd296938283e73f5a23475d3c40dd3c9be (diff) | |
| download | forums-9454377e55e379f408f8d456fe37b4104894d899.tar forums-9454377e55e379f408f8d456fe37b4104894d899.tar.gz forums-9454377e55e379f408f8d456fe37b4104894d899.tar.bz2 forums-9454377e55e379f408f8d456fe37b4104894d899.tar.xz forums-9454377e55e379f408f8d456fe37b4104894d899.zip | |
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB/phpbb/filesystem/filesystem.php')
| -rw-r--r-- | phpBB/phpbb/filesystem/filesystem.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/phpbb/filesystem/filesystem.php b/phpBB/phpbb/filesystem/filesystem.php index 943bce3910..9acead0876 100644 --- a/phpBB/phpbb/filesystem/filesystem.php +++ b/phpBB/phpbb/filesystem/filesystem.php @@ -835,7 +835,7 @@ class filesystem implements filesystem_interface $current_path = $resolved_path . '/' . $path_part; // Resolve symlinks - if (is_link($current_path)) + if (@is_link($current_path)) { if (!function_exists('readlink')) { @@ -872,12 +872,12 @@ class filesystem implements filesystem_interface $resolved_path = false; } - else if (is_dir($current_path . '/')) + else if (@is_dir($current_path . '/')) { $resolved[] = $path_part; $resolved_path = $current_path; } - else if (is_file($current_path)) + else if (@is_file($current_path)) { $resolved[] = $path_part; $resolved_path = $current_path; |