mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-21 23:43:17 +01:00
* Infolog: Add info_owner/... merge placeholders
This commit is contained in:
parent
d69b16f881
commit
23130ea078
@ -83,6 +83,8 @@ class infolog_merge extends Api\Storage\Merge
|
|||||||
{
|
{
|
||||||
$record = new infolog_egw_record($id);
|
$record = new infolog_egw_record($id);
|
||||||
$info = array();
|
$info = array();
|
||||||
|
// Keep original value for further processing
|
||||||
|
$info_owner = $record->info_owner;
|
||||||
|
|
||||||
// Convert to human friendly values
|
// Convert to human friendly values
|
||||||
$types = infolog_egw_record::$types;
|
$types = infolog_egw_record::$types;
|
||||||
@ -165,6 +167,8 @@ class infolog_merge extends Api\Storage\Merge
|
|||||||
{
|
{
|
||||||
$info+=$this->get_app_replacements($array['info_link']['app'], $array['info_link']['id'], $content, 'info_contact');
|
$info+=$this->get_app_replacements($array['info_link']['app'], $array['info_link']['id'], $content, 'info_contact');
|
||||||
}
|
}
|
||||||
|
// Add owner fields
|
||||||
|
$info += $this->contact_replacements(Accounts::id2name($info_owner,'person_id'),'info_owner');
|
||||||
|
|
||||||
// Add parent
|
// Add parent
|
||||||
if($record->info_id_parent)
|
if($record->info_id_parent)
|
||||||
|
Loading…
Reference in New Issue
Block a user