plugins/kolab_addressbook plugins/libkolab

[Thomas Brüderli]

 plugins/kolab_addressbook/lib/rcube_kolab_contacts.php |    1 -
 plugins/libkolab/lib/kolab_format_distributionlist.php |    4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 8d2cefff39f50cdcf27442a82055a0eeed894a78
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Sep 26 17:49:32 2012 +0200

    Fix creation of distribution lists AKA contact groups in Roundcube (#1045)

diff --git a/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php b/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
index f04a1c2..ed493a6 100644
--- a/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
+++ b/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
@@ -722,7 +722,6 @@ class rcube_kolab_contacts extends rcube_addressbook
         $result = false;
 
         $list = array(
-            'uid' => kolab_format::generate_uid(),
             'name' => $name,
             'member' => array(),
         );
diff --git a/plugins/libkolab/lib/kolab_format_distributionlist.php b/plugins/libkolab/lib/kolab_format_distributionlist.php
index a747b87..fcb94c1 100644
--- a/plugins/libkolab/lib/kolab_format_distributionlist.php
+++ b/plugins/libkolab/lib/kolab_format_distributionlist.php
@@ -71,6 +71,9 @@ class kolab_format_distributionlist extends kolab_format
 
         $this->obj->setMembers($members);
 
+        // set type property for proper caching
+        $object['_type'] = 'distribution-list';
+
         // cache this data
         $this->data = $object;
         unset($this->data['_formatobj']);
@@ -123,6 +126,7 @@ class kolab_format_distributionlist extends kolab_format
             'changed'   => self::php_datetime($this->obj->lastModified()),
             'name'      => $this->obj->name(),
             'member'    => array(),
+            '_type'     => 'distribution-list',
         );
 
         $members = $this->obj->members();