makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2019-09-22 12:17:50 +02:00
commit 6b3e616777
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/phpbb/filesystem/helper.php
View file

@ -289,7 +289,7 @@ class helper
$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'))
{ {
@ -326,12 +326,12 @@ class helper
$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;