Merge pull request laravel#1363 from franzliedke/patch-55

jasonlewis · jasonlewis · commit 73d4b0b2a178 · 2012-10-20T07:15:06.000-07:00
Many-to-many sync: always work with arrays
diff --git a/laravel/database/eloquent/relationships/has_many_and_belongs_to.php b/laravel/database/eloquent/relationships/has_many_and_belongs_to.php
@@ -121,6 +121,7 @@ public function detach($ids)
 	public function sync($ids)
 	{
 		$current = $this->pivot()->lists($this->other_key());
+		$ids = (array) $ids;
 
 		// First we need to attach any of the associated models that are not currently
 		// in the joining table. We'll spin through the given IDs, checking to see
@@ -140,7 +141,7 @@ public function sync($ids)
 
 		if (count($detach) > 0)
 		{
-			$this->detach(array_diff($current, $ids));
+			$this->detach($detach);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,7 @@ public function detach($ids)`
`121`	`121`	`public function sync($ids)`
`122`	`122`	`{`
`123`	`123`	`$current = $this->pivot()->lists($this->other_key());`
	`124`	`+ $ids = (array) $ids;`
`124`	`125`
`125`	`126`	`// First we need to attach any of the associated models that are not currently`
`126`	`127`	`// in the joining table. We'll spin through the given IDs, checking to see`
`@@ -140,7 +141,7 @@ public function sync($ids)`
`140`	`141`
`141`	`142`	`if (count($detach) > 0)`
`142`	`143`	`{`
`143`		`- $this->detach(array_diff($current, $ids));`
	`144`	`+ $this->detach($detach);`
`144`	`145`	`}`
`145`	`146`	`}`
`146`	`147`