mirror of
https://github.com/SuiteCRM/SuiteCRM-Core.git
synced 2025-08-29 08:17:18 +08:00
Merge ff1ed1de23
into 3e06d0f16a
This commit is contained in:
commit
404b4b810c
2 changed files with 5 additions and 0 deletions
|
@ -322,6 +322,10 @@ class HistoryTimelineDataHandler extends SubpanelDataQueryHandler implements Pre
|
|||
$listData[$key]['assigned_user_name']['user_name'] = showFullName() ? $user->full_name : ($user->user_name ?? '');
|
||||
$listData[$key]['assigned_user_name']['user_id'] = $record['assigned_user_id'];
|
||||
$listData[$key]['module_name'] = $panelToModuleName[$listData[$key]['panel_name']];
|
||||
$listData[$key]['description'] = html_entity_decode($listData[$key]['description'] ?? '', ENT_QUOTES);
|
||||
$listData[$key]['name'] = html_entity_decode($listData[$key]['name'] ?? '', ENT_QUOTES);
|
||||
$listData[$key]['status'] = html_entity_decode($listData[$key]['status'] ?? '', ENT_QUOTES);
|
||||
|
||||
}
|
||||
|
||||
$timelineEntryData = new ListData();
|
||||
|
|
|
@ -72,6 +72,7 @@ $toHTML = array(
|
|||
'>' => '>',
|
||||
"'" => ''',
|
||||
);
|
||||
$GLOBALS['toHTML'] = $toHTML;
|
||||
$GLOBALS['toHTML_keys'] = array_keys($toHTML);
|
||||
$GLOBALS['toHTML_values'] = array_values($toHTML);
|
||||
$GLOBALS['toHTML_keys_set'] = implode("", $GLOBALS['toHTML_keys']);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue