extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 00:13:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

"bugfix: if no specific custom field is selected, show/query all custom fields"

Browse Source
This commit is contained in:
Ralf Becker 2009-06-30 17:48:55 +00:00
parent 88cb7ac054
commit a51f1683ce
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -821,10 +821,11 @@ class infolog_so
$ids[$info['info_id']] = $info; $ids[$info['info_id']] = $info;
} }
if ($ids && ($query['custom_fields'] && strchr($query['selectcols'],'#') !== false || $query['csv_export'])) // if no specific custom field is selected, show/query all custom fields
if ($ids && ($query['custom_fields'] || $query['csv_export']))
{ {
$where = array('info_id' => array_keys($ids)); $where = array('info_id' => array_keys($ids));
if (!$query['csv_export']) if (!($query['csv_export'] || strchr($query['selectcols'],'#') === false))
{ {
$where['info_extra_name'] = array(); $where['info_extra_name'] = array();
foreach(explode(',',$query['selectcols']) as $col) foreach(explode(',',$query['selectcols']) as $col)