diff options
| -rw-r--r-- | system/database/drivers/oci8/oci8_driver.php | 6 | ||||
| -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 | 2 | ||||
| -rw-r--r-- | user_guide/installation/upgrading.html | 1 |
5 files changed, 16 insertions, 5 deletions
diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index d4adfd528..d4c27fa43 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -79,7 +79,7 @@ class CI_DB_oci8_driver extends CI_DB { */ function db_connect() { - return @ocilogon($this->username, $this->password, $this->hostname); + return @ocilogon($this->username, $this->password, $this->hostname, $this->char_set); } // -------------------------------------------------------------------- @@ -92,7 +92,7 @@ class CI_DB_oci8_driver extends CI_DB { */ function db_pconnect() { - return @ociplogon($this->username, $this->password, $this->hostname); + return @ociplogon($this->username, $this->password, $this->hostname, $this->char_set); } // -------------------------------------------------------------------- @@ -136,7 +136,7 @@ class CI_DB_oci8_driver extends CI_DB { */ function db_set_charset($charset, $collation) { - // @todo - add support if needed + // this is done upon connect return TRUE; } 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 ba138084e..8a4a70642 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> @@ -127,6 +128,7 @@ Change Log <li>Fixed a bug (#24) - ODBC database driver called incorrect parent in __construct().</li> <li>Fixed a bug (#85) - OCI8 (Oracle) database escape_str() function did not escape correct.</li> <li>Fixed a bug (#344) - Using schema found in <a href="libraries/sessions.html">Saving Session Data to a Database</a>, system would throw error "user_data does not have a default value" when deleting then creating a session.</li> + <li>Fixed a bug (#112) - OCI8 (Oracle) driver didn't pass the configured database character set when connecting.</li> </ul> <h2>Version 2.0.3</h2> diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index 58a45ee9d..0f4a29bfd 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -60,6 +60,7 @@ Upgrading from a Previous Version <p>Please read the upgrade notes corresponding to the version you are upgrading from.</p> <ul> + <li><a href="upgrade_210.html">Upgrading from 2.0.3 to 2.1.0</a></li> <li><a href="upgrade_203.html">Upgrading from 2.0.2 to 2.0.3</a></li> <li><a href="upgrade_202.html">Upgrading from 2.0.1 to 2.0.2</a></li> <li><a href="upgrade_201.html">Upgrading from 2.0 to 2.0.1</a></li> |