From 7d89d8866d841a78f24e91fbf0f1f7b7bbbd8fae Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 22 Oct 2009 13:41:44 +0000 Subject: [PATCH] "fixed calendar csv-export: - was only exporting 15 events (num_rows not forwarded to bo) - participants contained html for status icon" --- calendar/inc/class.calendar_uilist.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/calendar/inc/class.calendar_uilist.inc.php b/calendar/inc/class.calendar_uilist.inc.php index 14eac4fe18..a2fa6bb440 100644 --- a/calendar/inc/class.calendar_uilist.inc.php +++ b/calendar/inc/class.calendar_uilist.inc.php @@ -228,6 +228,7 @@ class calendar_uilist extends calendar_ui 'filter' => $this->filter, 'query' => $params['search'], 'offset' => (int) $params['start'], + 'num_rows'=> $params['num_rows'], 'order' => $params['order'] ? $params['order'].' '.$params['sort'] : 'cal_start', 'cfs' => $cfs, ); @@ -299,7 +300,7 @@ class calendar_uilist extends calendar_ui $readonlys['view['.$event['id'].']'] = !($readonlys['edit['.$event['id'].']'] = !$this->bo->check_perms(EGW_ACL_EDIT,$event)); $readonlys['delete['.$event['id'].']'] = !$this->bo->check_perms(EGW_ACL_DELETE,$event); - $event['parts'] = implode(",\n",$this->bo->participants($event)); + $event['parts'] = implode(",\n",$this->bo->participants($event,true)); $event['recure'] = $this->bo->recure2string($event); $event['date'] = $this->bo->date2string($event['start']); if (empty($event['description'])) $event['description'] = ' '; // no description screws the titles horz. alignment