From bcf92badd1dae888fec85c1b3615a924a2e6a859 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Mon, 26 Sep 2011 00:19:34 +0200
Subject: [PATCH] dont set content type to json for Apps
---
lib/json.php | 6 ++++--
settings/templates/apps.php | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/json.php b/lib/json.php
index 47d5e82fbb0..5ebd6c6b759 100644
--- a/lib/json.php
+++ b/lib/json.php
@@ -61,8 +61,10 @@ class OC_JSON{
/**
* Encode and print $data in json format
*/
- public static function encodedPrint($data){
- self::setContentTypeHeader();
+ public static function encodedPrint($data,$setContentType=true){
+ if($setContentType){
+ self::setContentTypeHeader();
+ }
echo json_encode($data);
}
}
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index ba2385d794f..6f16152bc5b 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -12,7 +12,7 @@
<li <?php if($app['active']) echo 'class="active"'?> data-id="<?php echo $app['id'] ?>">
<?php echo $app['name'] ?>
<span class="hidden">
- <?php OC_JSON::encodedPrint($app) ?>
+ <?php OC_JSON::encodedPrint($app,false) ?>
</span>
</li>
<?php endforeach;?>
--
GitLab