Merge pull request #1880 from authman/master

taylorotwell · taylorotwell · commit 9871281b3496 · 2013-05-13T23:12:08.000-07:00
Patch for -&gt;push();
diff --git a/laravel/database/eloquent/model.php b/laravel/database/eloquent/model.php
@@ -335,7 +335,7 @@ public function has_many_and_belongs_to($model, $table = null, $foreign = null,
 	 */
 	public function push()
 	{
-		$this->save();
+		if (!$this->save()) return false;
 
 		// To sync all of the relationships to the database, we will simply spin through
 		// the relationships, calling the "push" method on each of the models in that
@@ -349,9 +349,11 @@ public function push()
 
 			foreach ($models as $model)
 			{
-				$model->push();
+				if (!$model->push()) return false;
 			}
 		}
+
+		return true;
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ public function has_many_and_belongs_to($model, $table = null, $foreign = null,`
`335`	`335`	`*/`
`336`	`336`	`public function push()`
`337`	`337`	`{`
`338`		`- $this->save();`
	`338`	`+ if (!$this->save()) return false;`
`339`	`339`
`340`	`340`	`// To sync all of the relationships to the database, we will simply spin through`
`341`	`341`	`// the relationships, calling the "push" method on each of the models in that`
`@@ -349,9 +349,11 @@ public function push()`
`349`	`349`
`350`	`350`	`foreach ($models as $model)`
`351`	`351`	`{`
`352`		`- $model->push();`
	`352`	`+ if (!$model->push()) return false;`
`353`	`353`	`}`
`354`	`354`	`}`
	`355`	`+`
	`356`	`+ return true;`
`355`	`357`	`}`
`356`	`358`
`357`	`359`	`/**`