Merge pull request #104 from Rathil/master

Fix for method count without specifying $criteria but with the condition in defaultScope

EMongoDocument.php

@@ -730,12 +730,16 @@ public function saveCounters(array $counters,$lower=null,$upper=null) {
 	 * Count() allows you to count all the documents returned by a certain condition, it is analogous
 	 * to $db->collection->find()->count() and basically does exactly that...
 	 * @param EMongoCriteria|array $criteria
+	 * @return int
 	 */
 	public function count($criteria = array()){
 	    $this->trace(__FUNCTION__);
 
 	    // If we provide a manual criteria via EMongoCriteria or an array we do not use the models own DbCriteria
 	    $criteria = !empty($criteria) || $criteria instanceof EMongoCriteria ? $criteria : $this->getDbCriteria();
+		if (is_array($criteria) && isset($criteria['condition'])){
+			$criteria = $criteria['condition'];
+		}
 	    if($criteria instanceof EMongoCriteria)
 	        $criteria = $criteria->getCondition();
 	    return $this->getCollection()->find(isset($criteria) ? $criteria : array())->count();