2 commits - plugins/libkolab

[Thomas Brüderli]

 plugins/libkolab/lib/kolab_storage_folder.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5df13465a49a2305f1fbae7882d152d49b133f3d
Merge: 21286f0 43b287c
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Nov 21 14:35:39 2013 +0100

    Merge branch 'master' of ssh://git.kolab.org/git/roundcubemail-plugins-kolab



commit 21286f0bbb5188d92c59517aa15e082be7338bfd
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Nov 21 14:34:58 2013 +0100

    Make generated folder UIDs really unique

diff --git a/plugins/libkolab/lib/kolab_storage_folder.php b/plugins/libkolab/lib/kolab_storage_folder.php
index 1eb409b..766df8c 100644
--- a/plugins/libkolab/lib/kolab_storage_folder.php
+++ b/plugins/libkolab/lib/kolab_storage_folder.php
@@ -280,7 +280,7 @@ class kolab_storage_folder
         }
 
         // generate a folder UID and set it to IMAP
-        $uid = rtrim(chunk_split(md5($this->name . $this->get_owner()), 12, '-'), '-');
+        $uid = rtrim(chunk_split(md5($this->name . $this->get_owner() . uniqid('-', true)), 12, '-'), '-');
         $this->set_uid($uid);
 
         return $uid;