diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-07-26 16:47:05 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-07-26 16:47:05 +0200 |
| commit | e1d14ab461aa81363497e914cb6864da49ace372 (patch) | |
| tree | 0895467ace65657d5d0abfac8d4e7eb32decbaa8 /lib/json.php | |
| parent | 6ccd4e0cfb57d258301993157cf100061546f0c4 (diff) | |
| parent | c8de77b3fddf52eeaf0f81224e9b4aa2085bcc59 (diff) | |
| download | nextcloud-server-e1d14ab461aa81363497e914cb6864da49ace372.tar.gz nextcloud-server-e1d14ab461aa81363497e914cb6864da49ace372.zip | |
Merge branch 'master' into subadmin
Diffstat (limited to 'lib/json.php')
| -rw-r--r-- | lib/json.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/json.php b/lib/json.php index b0d3d918657..3d9d5c96fa3 100644 --- a/lib/json.php +++ b/lib/json.php @@ -106,12 +106,12 @@ class OC_JSON{ * Encode and print $data in json format */ public static function encodedPrint($data,$setContentType=true){ - // Disable mimesniffing, don't move this to setContentTypeHeader! - header( 'X-Content-Type-Options: nosniff' ); - if($setContentType){ - self::setContentTypeHeader(); - } - array_walk_recursive($data, array('OC_JSON', 'to_string')); - echo json_encode($data); + // Disable mimesniffing, don't move this to setContentTypeHeader! + header( 'X-Content-Type-Options: nosniff' ); + if($setContentType){ + self::setContentTypeHeader(); + } + array_walk_recursive($data, array('OC_JSON', 'to_string')); + echo json_encode($data); } } |