holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adapting missed export_limit_excepted processing to static bo_merge::is_export_limit_excepted

Browse Source
This commit is contained in:
Klaus Leithoff 2011-08-30 14:49:49 +00:00
parent 1cc3692bfd
commit 10411b539d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/class.calendar_export_csv.inc.php
View File

@ -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();

2
calendar/inc/class.calendar_export_ical.inc.php
View File

@ -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(