Upstream Patch: Fix caching for cache hits with no records

This commit is contained in:
Deon George 2011-05-31 10:43:30 +10:00
parent 6aabf025ca
commit ae2c1440ed

View File

@ -214,7 +214,7 @@ class Kohana_Database_Query {
// Set the cache key based on the database instance name and SQL
$cache_key = 'Database::query("'.$db.'", "'.$sql.'")';
if ($result = Kohana::cache($cache_key, NULL, $this->_lifetime))
if (! is_null($result = Kohana::cache($cache_key, NULL, $this->_lifetime)))
{
// Return a cached result
return new Database_Result_Cached($result, $sql, $this->_as_object, $this->_object_params);