summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-07-26 17:00:33 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-07-26 17:00:33 +0200
commitf0ecb55dfe8dbfaf4c65dbe9d7e1bba8c131ebf4 (patch)
tree89c4c7ed8d3c12c904d38a70111f5678508be64f
parent6e3d6921f0e0632c16a7d60bf3fca908ea09791e (diff)
If $htdocs = FALSE delete_files would never unlink
-rw-r--r--system/helpers/file_helper.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php
index 3834d4895..b6c95d554 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 === FALSE OR ($htdocs === TRUE && ! preg_match('/^(\.htaccess|index\.(html|htm|php)|web\.config)$/i', $filename)))
{
@unlink($path.DIRECTORY_SEPARATOR.$filename);
}