summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2017-05-10 10:36:31 +0200
committerAndrey Andreev <narf@devilix.net>2017-05-10 10:37:16 +0200
commitc9054be8617adb9418e8edb732d6e234f7024e82 (patch)
tree4cb094f4dceb99a36973db6e71a0473fb37db4e1 /system/database
parente6682fc34782ccf4fc6da0409448639942f8a222 (diff)
Merge pull request #5112 from cerealbeer/develop
read() in DB_cache fails when catching E_WARNING with custom error handler
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_cache.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB_cache.php b/system/database/DB_cache.php
index b74c31924..7c8ee5fc9 100644
--- a/system/database/DB_cache.php
+++ b/system/database/DB_cache.php
@@ -143,7 +143,7 @@ class CI_DB_Cache {
$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 ( ! is_file($filepath) OR FALSE === ($cachedata = file_get_contents($filepath)))
{
return FALSE;
}