diff options
| author | Timothy Warren <tim@timshomepage.net> | 2011-09-16 18:30:59 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2011-09-16 18:30:59 +0200 |
| commit | d223d112d9353515b88d3e01c3da0b4f1e656da8 (patch) | |
| tree | 932a4d76774afa35791cfe6c32daaa64339ed010 | |
| parent | 0a43ad879440c7dad246d3545ec883871ef460b8 (diff) | |
| parent | 05bd914a180a3c2d3dbbe2e0bf7b73dded3acd0c (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
| -rw-r--r-- | system/libraries/Cache/drivers/Cache_file.php | 11 | ||||
| -rw-r--r-- | system/libraries/Email.php | 1 | ||||
| -rw-r--r-- | user_guide/changelog.html | 1 |
3 files changed, 11 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/system/libraries/Email.php b/system/libraries/Email.php index 28a3d17b4..c8cb8549e 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -138,6 +138,7 @@ class CI_Email { * Initialize the Email Data * * @access public + * @param bool * @return void */ public function clear($clear_attachments = FALSE) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 17f89a310..f555159ee 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -115,6 +115,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> |