Merge ae62146 into 84f1df5

mongodb · Mar 26, 2014 · 18146b2 · 18146b2
2 parents 84f1df5 + ae62146
commit 18146b2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/Jenssegers/Mongodb/Relations/EmbedsMany.php b/src/Jenssegers/Mongodb/Relations/EmbedsMany.php
@@ -487,6 +487,7 @@ protected function toCollection(array $results = array())
 
             // Attatch the parent relation to the embedded model.
             $model->setRelation($this->foreignKey, $this->parent);
+            $model->setHidden(array_merge($model->getHidden(), array($this->foreignKey)));
 
             $models[] = $model;
         }

diff --git a/tests/RelationsTest.php b/tests/RelationsTest.php
@@ -342,6 +342,7 @@ public function testEmbedsManySave()
         $this->assertInstanceOf('DateTime', $address->created_at);
         $this->assertInstanceOf('DateTime', $address->updated_at);
         $this->assertInstanceOf('User', $address->user);
+        $this->assertEmpty($address->relationsToArray()); // prevent infinite loop
 
         $user = User::find($user->_id);
         $user->addresses()->save(new Address(array('city' => 'Bruxelles')));