Merge branch '4.0'

laravel · Sep 30, 2013 · bd4b0c6eb5633c8ebf6daf7ed2329550fb2761d5 · bd4b0c6
2 parents fb06030 + 3211024
commit bd4b0c6eb5633c8ebf6daf7ed2329550fb2761d5
Unified Split

Showing with 3 additions and 1 deletion.

+3 −1 src/Illuminate/Http/Response.php
diff --git a/src/Illuminate/Http/Response.php b/src/Illuminate/Http/Response.php
@@ -93,7 +93,9 @@ protected function morphToJson($content)
 	 */
 	protected function shouldBeJson($content)
 	{
-		return $content instanceof JsonableInterface or is_array($content);
+		return ($content instanceof JsonableInterface or
+			    $content instanceof ArrayObject or
+			    is_array($content));
 	}

 	/**