mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-02 19:39:39 +01:00
adapting missed export_limit_excepted processing to static bo_merge::is_export_limit_excepted
This commit is contained in:
parent
1cc3692bfd
commit
10411b539d
@ -26,7 +26,7 @@ class calendar_export_csv implements importexport_iface_export_plugin {
|
|||||||
$this->bo = new calendar_bo();
|
$this->bo = new calendar_bo();
|
||||||
$config = config::read('phpgwapi');
|
$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
|
// Custom fields need to be specifically requested
|
||||||
$cfs = array();
|
$cfs = array();
|
||||||
|
@ -32,7 +32,7 @@ class calendar_export_ical extends calendar_export_csv {
|
|||||||
if($key[0] == '#') $cfs[] = substr($key,1);
|
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') {
|
if($options['selection']['select'] == 'criteria') {
|
||||||
$query = array(
|
$query = array(
|
||||||
|
Loading…
Reference in New Issue
Block a user