diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-04-26 14:12:27 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-04-26 14:12:27 +0200 |
| commit | 96ddee29ef2d2deac9bfb91f7d508efca09ee70f (patch) | |
| tree | b1c620b7dee4ba6777aaa81cb399a966d0ba0bf8 /system | |
| parent | 8b9f059c07e2e7afa94390b46888cf7784575eeb (diff) | |
| parent | 9e2d5d130eff40592b49337a8ba4d8c170934de1 (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patch
Diffstat (limited to 'system')
| -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 3a373efd3..a5aabecd6 100644 --- a/system/helpers/file_helper.php +++ b/system/helpers/file_helper.php @@ -145,7 +145,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))$/', $filename)) + elseif ($htdocs === TRUE && ! preg_match('/^(\.htaccess|index\.(html|htm|php)|web\.config)$/i', $filename)) { @unlink($path.DIRECTORY_SEPARATOR.$filename); } |