From c3e142094f1d5013d634922003c94b0042a5d9bf Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Tue, 9 Dec 2014 09:42:46 -0500 Subject: [PATCH] Fix bug where configuration object UID was modified on object update (#4051) --- plugins/libkolab/lib/kolab_format_configuration.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/libkolab/lib/kolab_format_configuration.php b/plugins/libkolab/lib/kolab_format_configuration.php index d9dac697..30ddaf36 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']);