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

check if app is set before calling the hook on export_limit; TODO: move the call to bo_merge::getExportLimit and cache the appspecific returnvalue there, to improve speed

Browse Source
This commit is contained in:
Klaus Leithoff 2011-09-15 17:40:37 +00:00
parent f616b34f58
commit d216a37bba
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etemplate/inc/class.nextmatch_widget.inc.php
View File

@ -275,9 +275,9 @@ class nextmatch_widget
// save values in persistent extension_data to be able use it in post_process
unset($value['rows']);
$extension_data += $value;
$tname = is_object($value['template']) ? $value['template']->name : $value['template'];
list($app) = explode('.',$tname);
$export_limit = $GLOBALS['egw']->hooks->single('export_limit',$app);
list($app) = explode('.',$tmpl->name);
$export_limit = $GLOBALS['egw_info']['server']['export_limit'];
if (empty($app)) $export_limit = $GLOBALS['egw']->hooks->single('export_limit',$app);
$value['no_csv_export'] = $value['csv_fields'] === false ||
!bo_merge::hasExportLimit($export_limit,'ISALLOWED') &&
!bo_merge::is_export_limit_excepted();
@ -1454,7 +1454,8 @@ class nextmatch_widget
{
$name = is_object($value['template']) ? $value['template']->name : $value['template'];
list($app) = explode('.',$name);
$export_limit = $GLOBALS['egw']->hooks->single('export_limit',$app);
$export_limit = $GLOBALS['egw_info']['server']['export_limit'];
if (!empty($app)) $export_limit = $GLOBALS['egw']->hooks->single('export_limit',$app);
//if (isset($value['export_limit'])) $export_limit = $value['export_limit'];
}
$charset = $charset_out = translation::charset();