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

fix SQL error in async service due to removal of info_responsible column

Browse Source
This commit is contained in:
Ralf Becker 2016-09-12 22:57:00 +02:00
parent 23f5e5fb70
commit 3dd2f3bf64
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1024,20 +1024,21 @@ class infolog_so
{ {
$users[] = $row['info_responsible']; $users[] = $row['info_responsible'];
} }
foreach($this->db->select($this->info_table,'DISTINCT info_responsible',$this->statusFilter('open',false),__LINE__,__FILE__) as $row) foreach($this->db->select($this->info_table, "DISTINCT $this->users_table.account_id AS account_id",
$this->statusFilter('open',false), __LINE__, __FILE__, false, '', 'infolog', 0,
"JOIN $this->users_table ON $this->info_table.info_id=$this->users_table.info_id AND info_res_deleted IS NULL") as $row)
{ {
foreach(explode(',', $row['info_responsible']) as $responsible) $responsible = $row['account_id'];
if ($GLOBALS['egw']->accounts->get_type($responsible) == 'g')
{ {
if ($GLOBALS['egw']->accounts->get_type($responsible) == 'g') $responsible = $GLOBALS['egw']->accounts->members($responsible,true);
}
if ($responsible)
{
foreach((array)$responsible as $user)
{ {
$responsible = $GLOBALS['egw']->accounts->members($responsible,true); if ($user && !in_array($user,$users)) $users[] = $user;
}
if ($responsible)
{
foreach(is_array($responsible) ? $responsible : array($responsible) as $user)
{
if ($user && !in_array($user,$users)) $users[] = $user;
}
} }
} }
} }