diff options
author | Andrey Andreev <narf@devilix.net> | 2016-06-22 11:42:44 +0200 |
---|---|---|
committer | Andrey Andreev <narf@devilix.net> | 2016-06-22 11:42:44 +0200 |
commit | f7b028bf6db9c298db99cf800777ad3691b206b5 (patch) | |
tree | 1a521fd1bb8f597eeb6f11a693bd5182780232c8 /system | |
parent | 343163624e2527df9ce0c22a6e4ccfebf5b9f48b (diff) |
Fix #4675
Diffstat (limited to 'system')
-rw-r--r-- | system/helpers/file_helper.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php index 0d8d1d0d9..3cb36a551 100644 --- a/system/helpers/file_helper.php +++ b/system/helpers/file_helper.php @@ -138,13 +138,15 @@ if ( ! function_exists('delete_files')) { if ($filename !== '.' && $filename !== '..') { - if (is_dir($path.DIRECTORY_SEPARATOR.$filename) && $filename[0] !== '.') + $filepath = $path.DIRECTORY_SEPARATOR.$filename; + + if (is_dir($filepath) && $filename[0] !== '.' && ! is_link($filepath)) { - delete_files($path.DIRECTORY_SEPARATOR.$filename, $del_dir, $htdocs, $_level + 1); + delete_files($filepath, $del_dir, $htdocs, $_level + 1); } elseif ($htdocs !== TRUE OR ! preg_match('/^(\.htaccess|index\.(html|htm|php)|web\.config)$/i', $filename)) { - @unlink($path.DIRECTORY_SEPARATOR.$filename); + @unlink($filepath); } } } |