summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2013-04-25 03:18:52 -0700
committerThomas Tanghus <thomas@tanghus.net>2013-04-25 03:18:52 -0700
commit239777284765fc18c049a3b4d622acc983afb097 (patch)
tree8e1ffb1c684988553fb51315ad348b5de3135359
parent63b26997207f65a55173c013876e2000b4c0795e (diff)
parentc9c1e483c5e7af27a9ad56376a9dccfc893ef268 (diff)
downloadnextcloud-server-239777284765fc18c049a3b4d622acc983afb097.tar.gz
nextcloud-server-239777284765fc18c049a3b4d622acc983afb097.zip
Merge pull request #3126 from owncloud/json-utf8
use utf-8 encoding for json
-rw-r--r--lib/json.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/json.php b/lib/json.php
index f929e958957..6ba0b13806b 100644
--- a/lib/json.php
+++ b/lib/json.php
@@ -14,7 +14,7 @@ class OC_JSON{
public static function setContentTypeHeader($type='application/json') {
if (!self::$send_content_type_header) {
// We send json data
- header( 'Content-Type: '.$type );
+ header( 'Content-Type: '.$type . '; charset=utf-8');
self::$send_content_type_header = true;
}
}