Branch 'dev/new-foldernav' - plugins/calendar
Thomas Brüderli
bruederli at kolabsys.com
Fri May 16 11:03:50 CEST 2014
plugins/calendar/drivers/kolab/kolab_driver.php | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 2d85ff565f554577e4df8b30fdb08b79cacbb216
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Fri May 16 10:59:28 2014 +0200
Find next matching parent folder
diff --git a/plugins/calendar/drivers/kolab/kolab_driver.php b/plugins/calendar/drivers/kolab/kolab_driver.php
index 8f1af0c..c07d74a 100644
--- a/plugins/calendar/drivers/kolab/kolab_driver.php
+++ b/plugins/calendar/drivers/kolab/kolab_driver.php
@@ -128,8 +128,13 @@ class kolab_driver extends calendar_driver
$fullname = $cal->get_name();
$listname = $cal->get_foldername();
$imap_path = explode('/', $cal->name);
- $topname = array_pop($imap_path);
- $parent_id = kolab_storage::folder_id(join('/', $imap_path));
+
+ // find parent
+ do {
+ array_pop($imap_path);
+ $parent_id = kolab_storage::folder_id(join('/', $imap_path));
+ }
+ while (count($imap_path) > 0 && !$this->calendars[$parent_id]);
// turn a kolab_storage_folder object into a kolab_calendar
if ($cal instanceof kolab_storage_folder) {
More information about the commits
mailing list