forked from extern/egroupware
"fixed not exported cf's in the csv export"
This commit is contained in:
parent
011103b903
commit
bb3e31247a
@ -799,12 +799,12 @@ class soinfolog // DB-Layer
|
|||||||
|
|
||||||
$ids[$info['info_id']] = $info;
|
$ids[$info['info_id']] = $info;
|
||||||
}
|
}
|
||||||
if ($ids && $query['custom_fields'])
|
if ($ids && ($query['custom_fields'] || $query['csv_export']))
|
||||||
{
|
{
|
||||||
$this->db->select($this->extra_table,'*',array('info_id'=>array_keys($ids)),__LINE__,__FILE__);
|
$this->db->select($this->extra_table,'*',array('info_id'=>array_keys($ids)),__LINE__,__FILE__);
|
||||||
while ($row = $this->db->row(true))
|
while ($row = $this->db->row(true))
|
||||||
{
|
{
|
||||||
if ((isset($row['info_extra_value'])&&strlen($row['info_extra_value'])>0) &&
|
if ($query['csv_export'] || (isset($row['info_extra_value'])&&strlen($row['info_extra_value'])>0) &&
|
||||||
(stripos($query['selectcols'],'#'.$row['info_extra_name'])!==FALSE || !isset($query['selectcols']) ||
|
(stripos($query['selectcols'],'#'.$row['info_extra_name'])!==FALSE || !isset($query['selectcols']) ||
|
||||||
(stripos($query['selectcols'],'#')===FALSE && stripos($query['selectcols'],'customfields')!==FALSE) ))
|
(stripos($query['selectcols'],'#')===FALSE && stripos($query['selectcols'],'customfields')!==FALSE) ))
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user