diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2010-08-19 23:29:35 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2010-08-19 23:29:35 +0000 |
| commit | 45b6d344b4a5431e7cf11fde5808c63bf7553676 (patch) | |
| tree | 33a5bd2ee0124553c4d35f4152e607296479a551 /modules/gallery/helpers/json.php | |
| parent | d1475ec40ebda6404baab45b5b2482c651e657f9 (diff) | |
| parent | 21a0f832b66eaba902b09e2a88ece52c76e4a0c3 (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 |