Merge branch '3.1/develop' into 3.2/develop

Conflicts: classes/kohana/database/query.php
crowdfavorite · Jul 4, 2011 · 7ead0fe · 7ead0fe
2 parents f2ff545 + b9deff5
commit 7ead0fe
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/classes/kohana/database/query.php b/classes/kohana/database/query.php
@@ -233,7 +233,7 @@ public function execute($db = NULL, $as_object = NULL, $object_params = NULL)
 			$cache_key = 'Database::query("'.$db.'", "'.$sql.'")';
 
 			// Read the cache first to delete a possible hit with lifetime <= 0
-			if ($result = Kohana::cache($cache_key, NULL, $this->_lifetime)
+			if (($result = Kohana::cache($cache_key, NULL, $this->_lifetime)) !== NULL
 				AND ! $this->_force_execute)
 			{
 				// Return a cached result