Fix listing of top-level folder metadata

This commit is contained in:
Thomas Bruederli 2014-06-18 10:46:40 +02:00
parent 26a2dd01c4
commit 96fcb49c68

View file

@ -1029,13 +1029,14 @@ class kolab_storage
// GETMETADATA "%" doesn't list shared or other namespace folders but "*" would // GETMETADATA "%" doesn't list shared or other namespace folders but "*" would
if ($ns_root == '') { if ($ns_root == '') {
foreach ((array)self::$imap->get_metadata('%', $type_keys) as $folder => $metadata) { foreach ((array)self::$imap->get_metadata('%', $type_keys) as $folder => $metadata) {
if (!in_array($folder, $blacklist) && if (!in_array($folder, $blacklist)) {
($data = self::$imap->get_metadata($folder.$delimiter.'*', $type_keys))) {
$folderdata[$folder] = $metadata; $folderdata[$folder] = $metadata;
if ($data = self::$imap->get_metadata($folder.$delimiter.'*', $type_keys)) {
$folderdata += $data; $folderdata += $data;
} }
} }
} }
}
else if ($data = self::$imap->get_metadata($ns_root.$delimiter.'*', $type_keys)) { else if ($data = self::$imap->get_metadata($ns_root.$delimiter.'*', $type_keys)) {
$folderdata += $data; $folderdata += $data;
} }