summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-09-16 15:16:36 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-09-16 15:16:36 +0200
commit05bd914a180a3c2d3dbbe2e0bf7b73dded3acd0c (patch)
tree906ef5a43563bee6c15b8d8c222ed87d5e7c9691 /system
parent1fa4f87f359a3483fa54dad42d3c9d7e5fa45ccb (diff)
parent255a5c162a90279de3fca53d889d8c0daf2be7c0 (diff)
Merge pull request #453 from jeroenvdgulik/file-cache-unlink-bug
Unlink raised an error if cache file does not exist when you try to delete it
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Cache/drivers/Cache_file.php11
1 files changed, 9 insertions, 2 deletions
diff --git a/system/libraries/Cache/drivers/Cache_file.php b/system/libraries/Cache/drivers/Cache_file.php
index 6c37e7005..2a89faf09 100644
--- a/system/libraries/Cache/drivers/Cache_file.php
+++ b/system/libraries/Cache/drivers/Cache_file.php
@@ -107,7 +107,14 @@ class CI_Cache_file extends CI_Driver {
*/
public function delete($id)
{
- return unlink($this->_cache_path.$id);
+ if (file_exists($this->_cache_path.$id))
+ {
+ return unlink($this->_cache_path.$id);
+ }
+ else
+ {
+ return FALSE;
+ }
}
// ------------------------------------------------------------------------
@@ -192,4 +199,4 @@ class CI_Cache_file extends CI_Driver {
// End Class
/* End of file Cache_file.php */
-/* Location: ./system/libraries/Cache/drivers/Cache_file.php */ \ No newline at end of file
+/* Location: ./system/libraries/Cache/drivers/Cache_file.php */