summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2015-01-21 15:01:12 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2015-01-21 15:01:12 (GMT)
commitd6789046c6bb5575c13616003ffa4734a75f860b (patch)
tree734dfa5d3f3ea5afdfa90bd9543f81e226d9005e
parentc5922cce6e60f28e98286f8ebc2d6a67cad77e6e (diff)
downloadroundcubemail-plugins-kolab-d6789046c6bb5575c13616003ffa4734a75f860b.tar.gz
Don't suppress pending/declined events from other user's calendars (#4272)
-rw-r--r--plugins/calendar/drivers/kolab/kolab_calendar.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/calendar/drivers/kolab/kolab_calendar.php b/plugins/calendar/drivers/kolab/kolab_calendar.php
index b5c0844..404d35c 100644
--- a/plugins/calendar/drivers/kolab/kolab_calendar.php
+++ b/plugins/calendar/drivers/kolab/kolab_calendar.php
@@ -237,7 +237,7 @@ class kolab_calendar extends kolab_storage_folder_api
$query[] = array('dtend', '>=', $start);
// add query to exclude pending/declined invitations
- if (empty($filter_query)) {
+ if (empty($filter_query) && $this->get_namespace() != 'other') {
foreach ($user_emails as $email) {
$query[] = array('tags', '!=', 'x-partstat:' . $email . ':needs-action');
$query[] = array('tags', '!=', 'x-partstat:' . $email . ':declined');
@@ -257,7 +257,7 @@ class kolab_calendar extends kolab_storage_folder_api
$events = array();
foreach ($this->storage->select($query) as $record) {
// post-filter events to skip pending and declined invitations
- if (empty($filter_query) && is_array($record['attendees'])) {
+ if (empty($filter_query) && is_array($record['attendees']) && $this->get_namespace() != 'other') {
foreach ($record['attendees'] as $attendee) {
if (in_array($attendee['email'], $user_emails) && in_array($attendee['status'], array('NEEDS-ACTION','DECLINED'))) {
continue 2;