Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1483 from josem/develop 

Parameter JSON_OPTIONS added to response.php
This commit is contained in:
Taylor Otwell 2013-01-05 11:59:35 -08:00
parent 22c2c3843a a9760ecdbe
commit 277f1c620b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
laravel/response.php
View File

@ -89,15 +89,17 @@ public static function view($view, $data = array())
* @param mixed $data * @param mixed $data
* @param int $status * @param int $status
* @param array $headers * @param array $headers
* @param int $json_options
* @return Response * @return Response
*/ */
public static function json($data, $status = 200, $headers = array()) public static function json($data, $status = 200, $headers = array(), $json_options = 0)
{ {
$headers['Content-Type'] = 'application/json; charset=utf-8'; $headers['Content-Type'] = 'application/json; charset=utf-8';
return new static(json_encode($data), $status, $headers); return new static(json_encode($data, $json_options), $status, $headers);
} }
/** /**
* Create a new response of JSON'd Eloquent models. * Create a new response of JSON'd Eloquent models.
* *