From f67c02e1859a7228aa8e76fd8a48e7196e27173b Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Fri, 5 Jul 2013 13:38:16 +0200 Subject: [PATCH] Remove redundant code, this is done in parent's set() method --- plugins/libkolab/lib/kolab_format_configuration.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/plugins/libkolab/lib/kolab_format_configuration.php b/plugins/libkolab/lib/kolab_format_configuration.php index 104d90fe..5a8d3fff 100644 --- a/plugins/libkolab/lib/kolab_format_configuration.php +++ b/plugins/libkolab/lib/kolab_format_configuration.php @@ -44,7 +44,8 @@ class kolab_format_configuration extends kolab_format */ public function set(&$object) { - $this->init(); + // set common object properties + parent::set($object); // read type-specific properties switch ($object['type']) { @@ -63,12 +64,6 @@ class kolab_format_configuration extends kolab_format return false; } - // set some automatic values if missing - if (!empty($object['uid'])) - $this->obj->setUid($object['uid']); - if (!empty($object['created'])) - $this->obj->setCreated(self::get_datetime($object['created'])); - // adjust content-type string $this->CTYPE = $this->CTYPEv2 = 'application/x-vnd.kolab.configuration.' . $object['type'];