fix merge conflicts.

2012-03-30 08:44:23 -05:00
parent 062ae8756c 6aaf015cff
commit 636d05665c
6 changed files with 30 additions and 6 deletions
--- a/laravel/database/eloquent/relationships/has_many_and_belongs_to.php
+++ b/laravel/database/eloquent/relationships/has_many_and_belongs_to.php
@@ -170,9 +170,7 @@ class Has_Many_And_Belongs_To extends Relationship {
 	 */
 	public function delete()
 	{
-		$id = $this->base->get_key();
-
-		return $this->joining_table()->where($this->foreign_key(), '=', $id)->delete();
+		return $this->pivot()->delete();
 	}

 	/**