plugins/libkolab

[Aleksander Machniak]

 plugins/libkolab/lib/kolab_format_configuration.php |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 815ab6596b1c219eb0c023c0ec73873796dc30da
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Fri Dec 5 07:20:34 2014 -0500

    Fix Content-Type of configuration objects (#4029)

diff --git a/plugins/libkolab/lib/kolab_format_configuration.php b/plugins/libkolab/lib/kolab_format_configuration.php
index 4b06302..d9dac69 100644
--- a/plugins/libkolab/lib/kolab_format_configuration.php
+++ b/plugins/libkolab/lib/kolab_format_configuration.php
@@ -24,7 +24,7 @@
 
 class kolab_format_configuration extends kolab_format
 {
-    public $CTYPE   = 'application/x-vnd.kolab.configuration';
+    public $CTYPE   = 'application/vnd.kolab+xml';
     public $CTYPEv2 = 'application/x-vnd.kolab.configuration';
 
     protected $objclass   = 'Configuration';
@@ -126,7 +126,7 @@ class kolab_format_configuration extends kolab_format
         }
 
         // adjust content-type string
-        $this->CTYPE = $this->CTYPEv2 = 'application/x-vnd.kolab.configuration.' . $object['type'];
+        $this->CTYPEv2 = 'application/x-vnd.kolab.configuration.' . $object['type'];
 
         // cache this data
         $this->data = $object;
@@ -222,7 +222,7 @@ class kolab_format_configuration extends kolab_format
 
         // adjust content-type string
         if ($object['type']) {
-            $this->CTYPE = $this->CTYPEv2 = 'application/x-vnd.kolab.configuration.' . $object['type'];
+            $this->CTYPEv2 = 'application/x-vnd.kolab.configuration.' . $object['type'];
         }
 
         $this->data = $object;