More removal of error suppression usage
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 7551e48..ad9e31f 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -1577,16 +1577,13 @@
*/
protected function _cache_init()
{
- if (class_exists('CI_DB_Cache', FALSE))
+ if ( ! class_exists('CI_DB_Cache', FALSE))
{
- if (is_object($this->CACHE))
- {
- return TRUE;
- }
+ require_once(BASEPATH.'database/DB_cache.php');
}
- elseif ( ! @include_once(BASEPATH.'database/DB_cache.php'))
+ elseif (is_object($this->CACHE))
{
- return $this->cache_off();
+ return TRUE;
}
$this->CACHE = new CI_DB_Cache($this); // pass db object to support multiple db connections and returned db objects
diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php
index 11c5e11..a696112 100644
--- a/system/database/DB_utility.php
+++ b/system/database/DB_utility.php
@@ -356,8 +356,8 @@
// Is the encoder supported? If not, we'll either issue an
// error or use plain text depending on the debug settings
- if (($prefs['format'] === 'gzip' && ! @function_exists('gzencode'))
- OR ($prefs['format'] === 'zip' && ! @function_exists('gzcompress')))
+ if (($prefs['format'] === 'gzip' && ! function_exists('gzencode'))
+ OR ($prefs['format'] === 'zip' && ! function_exists('gzcompress')))
{
if ($this->db->db_debug)
{