mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-01 22:40:39 +02:00
Merge branch '3.3.x'
This commit is contained in:
@@ -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;
|
||||||
|
Reference in New Issue
Block a user