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

"fixed not shown calendar if custom fields are selected too"

Browse Source
This commit is contained in:
Ralf Becker 2007-09-14 10:31:08 +00:00
parent 4cdf282644
commit 4682133d82
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
addressbook/inc/class.uicontacts.inc.php
View File

@ -831,16 +831,19 @@ class uicontacts extends bocontacts
// do we need to read the custom fields, depends on the column is enabled and customfields exist // do we need to read the custom fields, depends on the column is enabled and customfields exist
$columselection = $this->prefs['nextmatch-addressbook.'.($do_email ? 'email' : 'index').'.rows']; $columselection = $this->prefs['nextmatch-addressbook.'.($do_email ? 'email' : 'index').'.rows'];
if ($columselection) $columselection = explode(',',$columselection); if ($columselection) $columselection = explode(',',$columselection);
if (!$id_only && $rows && ( if (!$id_only && $rows)
($show_custom_fields = (!$columselection || in_array('customfields',$columselection)) && $this->customfields) ||
($show_calendar = !$columselection || in_array('calendar',$columselection))))
{ {
foreach((array) $rows as $n => $val) $show_custom_fields = (!$columselection || in_array('customfields',$columselection)) && $this->customfields;
$show_calendar = !$columselection || in_array('calendar',$columselection);
if ($show_calendar || $show_custom_fields)
{ {
if ($val && (int)$val['id']) $ids[] = $val['id']; foreach($rows as $val)
{
$ids[] = $val['id'];
}
if ($show_custom_fields) $customfields = $this->read_customfields($ids);
if ($show_calendar) $calendar = $this->read_calendar($ids);
} }
if ($ids && $show_custom_fields) $customfields = $this->read_customfields($ids);
if ($ids && $show_calendar) $calendar = $this->read_calendar($ids);
} }
} }
if (!$rows) $rows = array(); if (!$rows) $rows = array();