2 commits - plugins/libkolab

Thomas Brüderli bruederli at kolabsys.com
Wed Jun 18 10:47:25 CEST 2014


 plugins/libkolab/lib/kolab_storage.php |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 9af610943e98e0d1051d507949df7b655789153a
Merge: 96fcb49 7dc391c
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Jun 18 10:46:50 2014 +0200

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



commit 96fcb49c68377419a2a6bb80acc35cf60eb8177e
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Jun 18 10:46:40 2014 +0200

    Fix listing of top-level folder metadata

diff --git a/plugins/libkolab/lib/kolab_storage.php b/plugins/libkolab/lib/kolab_storage.php
index 28c22e9..0897428 100644
--- a/plugins/libkolab/lib/kolab_storage.php
+++ b/plugins/libkolab/lib/kolab_storage.php
@@ -1029,10 +1029,11 @@ class kolab_storage
                     // GETMETADATA "%" doesn't list shared or other namespace folders but "*" would
                     if ($ns_root == '') {
                         foreach ((array)self::$imap->get_metadata('%', $type_keys) as $folder => $metadata) {
-                            if (!in_array($folder, $blacklist) &&
-                                ($data = self::$imap->get_metadata($folder.$delimiter.'*', $type_keys))) {
+                            if (!in_array($folder, $blacklist)) {
                                 $folderdata[$folder] = $metadata;
-                                $folderdata += $data;
+                                if ($data = self::$imap->get_metadata($folder.$delimiter.'*', $type_keys)) {
+                                    $folderdata += $data;
+                                }
                             }
                         }
                     }




More information about the commits mailing list