Merge pull request #249 from PatchRanger/master

Fix findOne: it missed $record in case of no cache
Sammaye · Mar 24, 2015 · a2fb31d · a2fb31d
2 parents b90b717 + dec9456
commit a2fb31d
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/EMongoDocument.php b/EMongoDocument.php
@@ -804,20 +804,18 @@ public function findOne($criteria = array(), $fields = array())
 			'Executing findOne: '.'{$query:' . json_encode($query) . ',$project:' . json_encode($project) . '}',
 			'extensions.MongoYii.EMongoDocument'
 		);
-		
+
 		if(
-			$this->getDbConnection()->queryCachingCount > 0 
+			$this->getDbConnection()->queryCachingCount > 0
 			&& $this->getDbConnection()->queryCachingDuration > 0
 			&& $this->getDbConnection()->queryCacheID !== false
-			&& ($cache = Yii::app()->getComponent($this->getDbConnection()->queryCacheID)) !== null
+			&& ($cache = Yii::app()->getComponent($this->getDbConnection()->queryCacheID))
+			&& ($cacheKey = 'yii:dbquery'.$this->getDbConnection()->server.':'.$this->getDbConnection()->db .':'.$this->getDbConnection()->getSerialisedQuery($query, $project).':'.$this->getCollection())
+			&& ($result = $cache->get($cacheKey)) !== false
 		){
 			$this->getDbConnection()->queryCachingCount--;
-			$cacheKey = 'yii:dbquery' . $this->getDbConnection()->server . ':' . $this->getDbConnection()->db;
-			$cacheKey .= ':' . $this->getDbConnection()->getSerialisedQuery($query, $project) . ':' . $this->getCollection();
-			if(($result = $cache->get($cacheKey)) !== false){
-				Yii::trace('Query result found in cache', 'extensions.MongoYii.EMongoDocument');
-				$record = $result[0];
-			}
+			Yii::trace('Query result found in cache', 'extensions.MongoYii.EMongoDocument');
+			$record = $result[0];
 		}else{
 			if($this->getDbConnection()->enableProfiling){
 				Yii::beginProfile(
@@ -1458,4 +1456,4 @@ public function trace($func)
 	{
 		Yii::trace(get_class($this) . '.' . $func . '()', 'extensions.MongoYii.EMongoDocument');
 	}
-}
+}