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

fix doublicate infolog when saving, caused by not setting info_id on read

Browse Source
This commit is contained in:
Ralf Becker 2016-09-12 16:25:27 +02:00
parent e231ac86cf
commit 3389bdd4b8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,7 +215,7 @@ class infolog_so
function aclFilter($_filter = False) function aclFilter($_filter = False)
{ {
$vars = null; $vars = null;
preg_match('/(my|responsible|delegated|own|privat|private|all|user)([0-9,-]*)(+deleted)?/',$_filter,$vars); preg_match('/(my|responsible|delegated|own|privat|private|all|user)([0-9,-]*)(\+deleted)?/',$_filter,$vars);
$filter = $vars[1]; $filter = $vars[1];
$f_user = $vars[2]; $f_user = $vars[2];
$deleted_too = !empty($vars[3]); $deleted_too = !empty($vars[3]);
@ -418,8 +418,9 @@ class infolog_so
if ($where) $where[] = "$this->users_table.info_res_deleted IS NULL"; if ($where) $where[] = "$this->users_table.info_res_deleted IS NULL";
if (!$where || if (!$where ||
!($this->data = $this->db->select($this->info_table, '*,'.$this->db->group_concat('account_id').' AS info_responsible', $where, !($this->data = $this->db->select($this->info_table,
__LINE__, __FILE__, false, "GROUP BY $this->info_table.info_id", 'infolog', 1, '*,'.$this->db->group_concat('account_id').' AS info_responsible,'.$this->info_table.'.info_id AS info_id',
$where, __LINE__, __FILE__, false, "GROUP BY $this->info_table.info_id", 'infolog', 1,
"LEFT JOIN $this->users_table ON $this->info_table.info_id=$this->users_table.info_id")->fetch())) "LEFT JOIN $this->users_table ON $this->info_table.info_id=$this->users_table.info_id")->fetch()))
{ {
$this->init( ); $this->init( );