diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-08-08 17:29:29 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-08-08 17:29:29 -0700 |
| commit | 58bf479f4c040ac73ea190d966ffd5408f9908f0 (patch) | |
| tree | a19dece598404b48cca783f89877944fd4538fb1 /modules/gallery/helpers/json.php | |
| parent | 1ad1f9517f91875875f2e062bda7d834827c3430 (diff) | |
| parent | acb1faaa594fc5067c4340e073afca3b83f819d4 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery/helpers/json.php')
| -rw-r--r-- | modules/gallery/helpers/json.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/modules/gallery/helpers/json.php b/modules/gallery/helpers/json.php index a39db27a..a88608aa 100644 --- a/modules/gallery/helpers/json.php +++ b/modules/gallery/helpers/json.php @@ -25,9 +25,7 @@ class json_Core { * @param mixed $message string or object to json encode and print */ static function reply($message) { - if (!headers_sent()) { - header("Content-Type: application/json; charset=" . Kohana::CHARSET); - } + header("Content-Type: application/json; charset=" . Kohana::CHARSET); print json_encode($message); } }
\ No newline at end of file |