dont set content type to json for Apps

diff --git a/lib/json.php b/lib/json.php
index 47d5e82fbb00d03ad5c703e4033ad9a86bcd704f..5ebd6c6b759b10cbffb60aa02ee62b084895352f 100644 (file)
--- 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 ba2385d794f68c8ebdafbb3490532bbec173d427..6f16152bc5bbca07e3dc91302cb782d9c0decfea 100644 (file)
--- 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;?>