diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-09-16 15:16:36 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-09-16 15:16:36 +0200 |
| commit | 05bd914a180a3c2d3dbbe2e0bf7b73dded3acd0c (patch) | |
| tree | 906ef5a43563bee6c15b8d8c222ed87d5e7c9691 | |
| parent | 1fa4f87f359a3483fa54dad42d3c9d7e5fa45ccb (diff) | |
| parent | 255a5c162a90279de3fca53d889d8c0daf2be7c0 (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
| -rw-r--r-- | system/libraries/Cache/drivers/Cache_file.php | 11 | ||||
| -rw-r--r-- | user_guide/changelog.html | 1 |
2 files changed, 10 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 */ diff --git a/user_guide/changelog.html b/user_guide/changelog.html index ba138084e..8dd64a3a2 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -114,6 +114,7 @@ Change Log <h3>Bug fixes for 2.1.0</h3> <ul> + <li class="reactor">Unlink raised an error if cache file did not exist when you try to delete it.</li> <li class="reactor">Fixed #378 Robots identified as regular browsers by the User Agent class.</li> <li class="reactor">If a config class was loaded first then a library with the same name is loaded, the config would be ignored.</li> <li class="reactor">Fixed a bug (Reactor #19) where 1) the 404_override route was being ignored in some cases, and 2) auto-loaded libraries were not available to the 404_override controller when a controller existed but the requested method did not.</li> |