diff options
| author | Eric Roberts <eric@cryode.com> | 2012-08-03 22:39:04 +0200 |
|---|---|---|
| committer | Eric Roberts <eric@cryode.com> | 2012-08-03 22:39:04 +0200 |
| commit | 17636e8bb20a4d53fec8fd8aaf530f53bd22d612 (patch) | |
| tree | a844b9aff5ecb42ce2c49ea4e187ef44cc4d39a8 /system/helpers/file_helper.php | |
| parent | da038d2ebccb4d45ea6d819c914563b2bc009a86 (diff) | |
| parent | 6c94c2dcfb6557947c9ac67e419b2856fd80e01d (diff) | |
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into develop
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); } |