diff options
| author | dchill42 <dchill42@gmail.com> | 2012-07-31 15:41:01 +0200 |
|---|---|---|
| committer | dchill42 <dchill42@gmail.com> | 2012-07-31 15:41:01 +0200 |
| commit | 7e92b7332ea4d28648e69eabcb93cead35dbca26 (patch) | |
| tree | b7714536b89557129ed51fe675725fe28639c1e0 /system/helpers/file_helper.php | |
| parent | 57486009573a86d9e286a49c92216ba17aae0d5a (diff) | |
| parent | 3a2d573a96241c01124d15c1ce517078e07c6235 (diff) | |
Merge branch 'develop' of github.com:/EllisLab/CodeIgniter into session
Diffstat (limited to 'system/helpers/file_helper.php')
| -rw-r--r-- | system/helpers/file_helper.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php index 3834d4895..e68bb7f7a 100644 --- a/system/helpers/file_helper.php +++ b/system/helpers/file_helper.php @@ -124,7 +124,7 @@ if ( ! function_exists('delete_files')) { delete_files($path.DIRECTORY_SEPARATOR.$filename, $del_dir, $level + 1, $htdocs); } - elseif ($htdocs === TRUE && ! preg_match('/^(\.htaccess|index\.(html|htm|php)|web\.config)$/i', $filename)) + elseif ($htdocs !== TRUE OR ! preg_match('/^(\.htaccess|index\.(html|htm|php)|web\.config)$/i', $filename)) { @unlink($path.DIRECTORY_SEPARATOR.$filename); } |