extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-27 05:11:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Handle selected columns as array without erroring

Browse Source
This commit is contained in:
Nathan Gray 2014-03-24 17:00:54 +00:00
parent 02ea708a38
commit ab8cc893f7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
infolog/inc/class.infolog_so.inc.php
View File

@ -906,11 +906,11 @@ class infolog_so
$index_load_cfs && $query['col_filter']['info_type'] && in_array($query['col_filter']['info_type'],$index_load_cfs))) $index_load_cfs && $query['col_filter']['info_type'] && in_array($query['col_filter']['info_type'],$index_load_cfs)))
{ {
$where = array('info_id' => array_keys($ids)); $where = array('info_id' => array_keys($ids));
if (!($query['csv_export'] || strchr($query['selectcols'],'#') === false || if (!($query['csv_export'] || strchr(implode(',',$query['selectcols']),'#') === false ||
$index_load_cfs && $query['col_filter']['info_type'] && in_array($query['col_filter']['info_type'],$index_load_cfs))) $index_load_cfs && $query['col_filter']['info_type'] && in_array($query['col_filter']['info_type'],$index_load_cfs)))
{ {
$where['info_extra_name'] = array(); $where['info_extra_name'] = array();
foreach(explode(',',$query['selectcols']) as $col) foreach(is_array($query['selectcols']) ? $query['selectcols'] : explode(',',$query['selectcols']) as $col)
{ {
if ($col[0] == '#') $where['info_extra_name'][] = substr($col,1); if ($col[0] == '#') $where['info_extra_name'][] = substr($col,1);
} }