Merge branch '4.2'

taylorotwell · taylorotwell · commit 0464fe35f660 · 2014-05-31T20:08:56.000-05:00
diff --git a/src/Illuminate/Database/Eloquent/Model.php b/src/Illuminate/Database/Eloquent/Model.php
@@ -2157,7 +2157,7 @@ public function attributesToArray()
 		// formatting while accessing attributes vs. arraying / JSONing a model.
 		foreach ($this->getDates() as $key)
 		{
-			if ( ! array_key_exists($key, $attributes)) continue;
+			if ( ! isset($attributes[$key])) continue;
 
 			$attributes[$key] = (string) $this->asDateTime($attributes[$key]);
 		}

Original file line number	Diff line number	Diff line change
`@@ -2157,7 +2157,7 @@ public function attributesToArray()`
`2157`	`2157`	`// formatting while accessing attributes vs. arraying / JSONing a model.`
`2158`	`2158`	`foreach ($this->getDates() as $key)`
`2159`	`2159`	`{`
`2160`		`- if ( ! array_key_exists($key, $attributes)) continue;`
	`2160`	`+ if ( ! isset($attributes[$key])) continue;`
`2161`	`2161`
`2162`	`2162`	`$attributes[$key] = (string) $this->asDateTime($attributes[$key]);`
`2163`	`2163`	`}`