From e40d1c4dcda92b2a194389523ffd212f3c9c55ea Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Tue, 15 Oct 2013 10:31:52 +0200 Subject: [PATCH] Limit virtual folder tree to task/calendar main views --- plugins/calendar/drivers/kolab/kolab_driver.php | 2 +- plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/calendar/drivers/kolab/kolab_driver.php b/plugins/calendar/drivers/kolab/kolab_driver.php index 52da1c57..019b8b7c 100644 --- a/plugins/calendar/drivers/kolab/kolab_driver.php +++ b/plugins/calendar/drivers/kolab/kolab_driver.php @@ -109,7 +109,7 @@ class kolab_driver extends calendar_driver $calendars = $names = array(); // include virtual folders for a full folder tree - if (!$active && !$personal && !$this->rc->output->ajax_call) + if (!$active && !$personal && !$this->rc->output->ajax_call && in_array($this->rc->action, array('index',''))) $folders = $this->_folder_hierarchy($folders, $this->rc->get_storage()->get_hierarchy_delimiter()); foreach ($folders as $id => $cal) { diff --git a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php index 40138aae..2062aad9 100644 --- a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php +++ b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php @@ -84,7 +84,7 @@ class tasklist_kolab_driver extends tasklist_driver $listnames = array(); // include virtual folders for a full folder tree - if (!$this->rc->output->ajax_call) + if (!$this->rc->output->ajax_call && in_array($this->rc->action, array('index',''))) $folders = $this->_folder_hierarchy($folders, $delim); foreach ($folders as $folder) {