summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <machniak@kolabsys.com>2014-12-09 14:42:46 (GMT)
committerAleksander Machniak <machniak@kolabsys.com>2014-12-09 14:42:46 (GMT)
commitc3e142094f1d5013d634922003c94b0042a5d9bf (patch)
tree18affb09639bb305b1a612053e194490e6807dba
parent67805892846cfcd412e9ad957e727dc745705790 (diff)
downloadroundcubemail-plugins-kolab-c3e142094f1d5013d634922003c94b0042a5d9bf.tar.gz
Fix bug where configuration object UID was modified on object update (#4051)
-rw-r--r--plugins/libkolab/lib/kolab_format_configuration.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/libkolab/lib/kolab_format_configuration.php b/plugins/libkolab/lib/kolab_format_configuration.php
index d9dac69..30ddaf3 100644
--- a/plugins/libkolab/lib/kolab_format_configuration.php
+++ b/plugins/libkolab/lib/kolab_format_configuration.php
@@ -48,9 +48,6 @@ class kolab_format_configuration extends kolab_format
*/
public function set(&$object)
{
- // set common object properties
- parent::set($object);
-
// read type-specific properties
switch ($object['type']) {
case 'dictionary':
@@ -128,6 +125,9 @@ class kolab_format_configuration extends kolab_format
// adjust content-type string
$this->CTYPEv2 = 'application/x-vnd.kolab.configuration.' . $object['type'];
+ // set common object properties
+ parent::set($object);
+
// cache this data
$this->data = $object;
unset($this->data['_formatobj']);