lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0

Browse Source
This commit is contained in:
Laurent Destailleur 2020-03-12 18:34:43 +01:00
commit 7e428885cc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/ticket/class/ticket.class.php
View File

@ -1696,7 +1696,7 @@ class Ticket extends CommonObject
// Cache already loaded // Cache already loaded
$sql = "SELECT id as rowid, fk_user_author, datec, label, note as message, visibility"; $sql = "SELECT id as rowid, fk_user_author, datec, label, note as message, code";
$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm"; $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm";
$sql .= " WHERE fk_element = ".(int) $this->id; $sql .= " WHERE fk_element = ".(int) $this->id;
$sql .= " AND elementtype = 'ticket'"; $sql .= " AND elementtype = 'ticket'";
@ -1714,7 +1714,7 @@ class Ticket extends CommonObject
$this->cache_msgs_ticket[$i]['datec'] = $this->db->jdate($obj->datec); $this->cache_msgs_ticket[$i]['datec'] = $this->db->jdate($obj->datec);
$this->cache_msgs_ticket[$i]['subject'] = $obj->label; $this->cache_msgs_ticket[$i]['subject'] = $obj->label;
$this->cache_msgs_ticket[$i]['message'] = $obj->message; $this->cache_msgs_ticket[$i]['message'] = $obj->message;
$this->cache_msgs_ticket[$i]['private'] = ($obj->visibility == 'private' ? 1 : 0); $this->cache_msgs_ticket[$i]['private'] = ($obj->code == 'TICKET_MSG_PRIVATE' ? 1 : 0);
$i++; $i++;
} }
return $num; return $num;