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

fix PHP 8.0 TypeError: when exporting multiple users

Browse Source 
Argument 1 passed to EGroupware\Api\Accounts::username() must be of the type int or null, array given
This commit is contained in:
Ralf Becker 2021-10-11 18:33:47 +02:00
parent 43806f3e39
commit a427b5d5c8
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
timesheet/inc/class.timesheet_ui.inc.php
View File

@ -660,12 +660,16 @@ class timesheet_ui extends timesheet_bo
unset($query['col_filter']['cat_id']); unset($query['col_filter']['cat_id']);
} }
$GLOBALS['egw_info']['flags']['app_header'] = lang('timesheet'); $GLOBALS['egw_info']['flags']['app_header'] = lang('timesheet');
if ($query['col_filter']['ts_owner']) if (!empty($query['col_filter']['ts_owner']))
{ {
$GLOBALS['egw_info']['flags']['app_header'] .= ': '.Api\Accounts::username($query['col_filter']['ts_owner']); $GLOBALS['egw_info']['flags']['app_header'] .= ': '.implode(', ',
#if ($GLOBALS['egw']->accounts->get_type($query['col_filter']['ts_owner']) == 'g') $GLOBALS['egw_info']['flags']['app_header'] .= ' '. lang("and its members"); array_map(Api\Accounts::class.'::username', (array)$query['col_filter']['ts_owner']));
#_debug_array($GLOBALS['egw']->accounts->members($query['col_filter']['ts_owner'],true));
if ($query['col_filter']['ts_owner']<0) $query['col_filter']['ts_owner'] = array_merge(array($query['col_filter']['ts_owner']),$GLOBALS['egw']->accounts->members($query['col_filter']['ts_owner'],true)); if ($query['col_filter']['ts_owner'] < 0)
{
$query['col_filter']['ts_owner'] = array_merge(array($query['col_filter']['ts_owner']),
$GLOBALS['egw']->accounts->members($query['col_filter']['ts_owner'],true));
}
} }
else else
{ {