Merge pull request laravel#4813 from suwardany/bugfix/model-performUpdate

taylorotwell · taylorotwell · commit ea6301ab5381 · 2014-06-26T12:32:19.000-05:00
[bugfix] Fixes a bug introduced by laravel#4773
diff --git a/src/Illuminate/Database/Eloquent/Model.php b/src/Illuminate/Database/Eloquent/Model.php
@@ -1414,7 +1414,7 @@ protected function finishSave(array $options)
 	 * Perform a model update operation.
 	 *
 	 * @param  \Illuminate\Database\Eloquent\Builder  $query
-	 * @return bool
+	 * @return bool|null
 	 */
 	protected function performUpdate(Builder $query)
 	{
@@ -1449,11 +1449,9 @@ protected function performUpdate(Builder $query)
 
 				$this->fireModelEvent('updated', false);
 			}
-			
+
 			return true;
 		}
-
-		return false;
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -1414,7 +1414,7 @@ protected function finishSave(array $options)`
`1414`	`1414`	`* Perform a model update operation.`
`1415`	`1415`	`*`
`1416`	`1416`	`* @param \Illuminate\Database\Eloquent\Builder $query`
`1417`		`- * @return bool`
	`1417`	`+ * @return bool\|null`
`1418`	`1418`	`*/`
`1419`	`1419`	`protected function performUpdate(Builder $query)`
`1420`	`1420`	`{`
`@@ -1449,11 +1449,9 @@ protected function performUpdate(Builder $query)`
`1449`	`1449`
`1450`	`1450`	`$this->fireModelEvent('updated', false);`
`1451`	`1451`	`}`
`1452`		`-`
	`1452`	`+`
`1453`	`1453`	`return true;`
`1454`	`1454`	`}`
`1455`		`-`
`1456`		`- return false;`
`1457`	`1455`	`}`
`1458`	`1456`
`1459`	`1457`	`/**`