From 10411b539db0f38b67cb659ae0751546314c23fa Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Tue, 30 Aug 2011 14:49:49 +0000 Subject: [PATCH] adapting missed export_limit_excepted processing to static bo_merge::is_export_limit_excepted --- calendar/inc/class.calendar_export_csv.inc.php | 2 +- calendar/inc/class.calendar_export_ical.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/calendar/inc/class.calendar_export_csv.inc.php b/calendar/inc/class.calendar_export_csv.inc.php index 61237a62a4..630719f44a 100644 --- a/calendar/inc/class.calendar_export_csv.inc.php +++ b/calendar/inc/class.calendar_export_csv.inc.php @@ -26,7 +26,7 @@ class calendar_export_csv implements importexport_iface_export_plugin { $this->bo = new calendar_bo(); $config = config::read('phpgwapi'); - $limit_exception = count(array_intersect(array($GLOBALS['egw_info']['user']['account_id']) + $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'],true), unserialize($GLOBALS['egw_info']['server']['export_limit_excepted']))) > 0; + $limit_exception = bo_merge::is_export_limit_excepted(); // Custom fields need to be specifically requested $cfs = array(); diff --git a/calendar/inc/class.calendar_export_ical.inc.php b/calendar/inc/class.calendar_export_ical.inc.php index 8c4303f851..0051a6cb42 100644 --- a/calendar/inc/class.calendar_export_ical.inc.php +++ b/calendar/inc/class.calendar_export_ical.inc.php @@ -32,7 +32,7 @@ class calendar_export_ical extends calendar_export_csv { if($key[0] == '#') $cfs[] = substr($key,1); } - $limit_exception = count(array_intersect(array($GLOBALS['egw_info']['user']['account_id']) + $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'],true), unserialize($GLOBALS['egw_info']['server']['export_limit_excepted']))) > 0; + $limit_exception = bo_merge::is_export_limit_excepted(); if($options['selection']['select'] == 'criteria') { $query = array(