Merge branch 'devel'

luttkens · Feb 16, 2011 · 5a95a9f · 5a95a9f
2 parents 1546150 + 5450a00
commit 5a95a9f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/EMongoDocument.php b/EMongoDocument.php
@@ -1281,7 +1281,7 @@ public function search($caseSensitive = false)
 
 		$this->setDbCriteria($criteria);
 
-		return $this;
+		return new EMongoDocumentDataProvider($this);
 	}
 
 	/**

diff --git a/EMongoSoftDocument.php b/EMongoSoftDocument.php
@@ -78,11 +78,7 @@ public function __isset($name)
 	public function __unset($name)
 	{
 		if(array_key_exists($name, $this->softAttributes)) // Use of array_key_exists is mandatory !!!
-		{
 			unset($this->softAttributes[$name]);
-			$names = array_flip($this->_attributeNames);
-			unset($this->_attributeNames[$names[$name]]);
-		}
 		else
 			parent::__unset($name);
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -1281,7 +1281,7 @@ public function search($caseSensitive = false) @@
     		$this->setDbCriteria($criteria);
-    		return $this;
+    		return new EMongoDocumentDataProvider($this);
     	}
     	/**
@@ Expand Down @@