Permalink
Browse files

Merge branch '3.0/develop' into 3.1/develop

  • Loading branch information...
2 parents cc21f54 + e353340 commit b9deff58a851e76efcdbb25dd4e1dafbe1fe72d2 @cbandy cbandy committed Jul 4, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 classes/kohana/database/query.php
@@ -214,7 +214,7 @@ public function execute($db = NULL)
// 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 (($result = Kohana::cache($cache_key, NULL, $this->_lifetime)) !== NULL)
{
// Return a cached result
return new Database_Result_Cached($result, $sql, $this->_as_object, $this->_object_params);

0 comments on commit b9deff5

Please sign in to comment.