Fix some DB_cache-related issues
http://codeigniter.com/forums/viewthread/229610/
diff --git a/system/database/DB_cache.php b/system/database/DB_cache.php
index 1be80c5..db76364 100644
--- a/system/database/DB_cache.php
+++ b/system/database/DB_cache.php
@@ -122,7 +122,7 @@
$segment_two = ($this->CI->uri->segment(2) == FALSE) ? 'index' : $this->CI->uri->segment(2);
$filepath = $this->db->cachedir.$segment_one.'+'.$segment_two.'/'.md5($sql);
- if (FALSE === ($cachedata = file_get_contents($filepath)))
+ if (FALSE === ($cachedata = @file_get_contents($filepath)))
{
return FALSE;
}
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 4fcb6c6..1193b42 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -692,7 +692,7 @@
// resource ID won't be any good once we've cached the
// result object, so we'll have to compile the data
// and save it)
- $CR = new CI_DB_result();
+ $CR = new CI_DB_result($this);
$CR->result_object = $RES->result_object();
$CR->result_array = $RES->result_array();
$CR->num_rows = $RES->num_rows();