lib/kolab_sync_backend.php

[Aleksander Machniak]

 lib/kolab_sync_backend.php |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ed523c25fdfaa9033999485e9e7b6e29118ccfb4
Author: Aleksander Machniak <alec at alec.pl>
Date:   Thu Jan 10 16:05:05 2013 +0100

    Read private annotation of folder types to properly handle special mail folders

diff --git a/lib/kolab_sync_backend.php b/lib/kolab_sync_backend.php
index 46d16de..25c2fb1 100644
--- a/lib/kolab_sync_backend.php
+++ b/lib/kolab_sync_backend.php
@@ -393,7 +393,7 @@ class kolab_sync_backend
             $this->root_meta['DEVICE'][$id] = $device;
 
             // Subscribe to default folders
-            $foldertypes = $this->storage->get_metadata('*', kolab_storage::CTYPE_KEY);
+            $foldertypes = $this->storage->get_metadata('*', array(kolab_storage::CTYPE_KEY, kolab_storage::CTYPE_KEY_PRIVATE));
             $types       = array(
                 'mail.drafts',
                 'mail.wastebasket',
@@ -407,7 +407,7 @@ class kolab_sync_backend
                 'task'
             );
 
-            $foldertypes = array_map('implode', $foldertypes);
+            $foldertypes = array_map(array('kolab_storage', 'folder_select_metadata'), $foldertypes);
             $foldertypes = array_intersect($foldertypes, $types);
 
             // get default folders