diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-08-16 21:54:40 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-08-16 21:54:40 -0700 |
| commit | de91d0fe4f5764eae7902a4790c57cac635aa0be (patch) | |
| tree | fd4996f0c939187c6908689596400bd5e8814c0b /modules/rest/helpers | |
| parent | 9592f2f2e6dfff7f5a500b29511ba3bd23a0fa15 (diff) | |
| parent | 8c2ed0d681364837ab51b35d7aeb895b8adfa470 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/rest/helpers')
| -rw-r--r-- | modules/rest/helpers/rest.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/rest/helpers/rest.php b/modules/rest/helpers/rest.php index 3a6b2cad..d5ed0452 100644 --- a/modules/rest/helpers/rest.php +++ b/modules/rest/helpers/rest.php @@ -36,7 +36,7 @@ class rest_Core { } if (preg_match('/^[$A-Za-z_][0-9A-Za-z_]*$/', $callback) == 1) { - header("Content-type: application/javascript"); + header("Content-type: application/javascript; charset=UTF-8"); print "$callback(" . json_encode($data) . ")"; } else { throw new Rest_Exception( |