Merge branch '4.0'

taylorotwell · taylorotwell · commit 088614a1518d · 2013-10-09T14:51:03.000-05:00
diff --git a/src/Illuminate/Database/Eloquent/Model.php b/src/Illuminate/Database/Eloquent/Model.php
@@ -337,7 +337,7 @@ public function fill(array $attributes)
 	 */
 	protected function fillableFromArray(array $attributes)
 	{
-		if (count($this->fillable) > 0)
+		if (count($this->fillable) > 0 and ! static::$unguarded)
 		{
 			return array_intersect_key($attributes, array_flip($this->fillable));
 		}

Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,7 @@ public function fill(array $attributes)`
`337`	`337`	`*/`
`338`	`338`	`protected function fillableFromArray(array $attributes)`
`339`	`339`	`{`
`340`		`- if (count($this->fillable) > 0)`
	`340`	`+ if (count($this->fillable) > 0 and ! static::$unguarded)`
`341`	`341`	`{`
`342`	`342`	`return array_intersect_key($attributes, array_flip($this->fillable));`
`343`	`343`	`}`