ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse Source
This commit is contained in:
Chris Berthe
2012-07-12 11:15:43 -04:00
parent 3b6191ec16 1503aed7ce
commit b325e954e3
25 changed files with 538 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
laravel/response.php
View File

@@ -93,7 +93,7 @@ class Response {
*/
public static function json($data, $status = 200, $headers = array())
{
$headers['Content-Type'] = 'application/json';
$headers['Content-Type'] = 'application/json; charset=utf-8';
return new static(json_encode($data), $status, $headers);
}
@@ -113,7 +113,7 @@ class Response {
*/
public static function eloquent($data, $status = 200, $headers = array())
{
$headers['Content-Type'] = 'application/json';
$headers['Content-Type'] = 'application/json; charset=utf-8';
return new static(eloquent_to_json($data), $status, $headers);
}