mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-24 17:04:14 +01:00
* Infolog, Timesheet - Fix link title placeholders not working
This commit is contained in:
parent
cceba01f87
commit
d5cf6a600f
@ -121,9 +121,6 @@ class infolog_merge extends Api\Storage\Merge
|
||||
}
|
||||
}
|
||||
|
||||
// Links
|
||||
$array += $this->get_all_links('infolog', $id, $prefix, $content);
|
||||
|
||||
// Timesheet time
|
||||
if(strpos($content, 'info_sum_timesheets'))
|
||||
{
|
||||
@ -153,6 +150,9 @@ class infolog_merge extends Api\Storage\Merge
|
||||
$info['$$'.($prefix ? $prefix.'/':'').$key.'$$'] = $value;
|
||||
}
|
||||
|
||||
// Links
|
||||
$info += $this->get_all_links('infolog', $id, $prefix, $content);
|
||||
|
||||
// Add contact fields
|
||||
if($array['info_link'] && $array['info_link']['app'] && $array['info_link']['id'])
|
||||
{
|
||||
|
@ -139,15 +139,16 @@ class timesheet_merge extends Api\Storage\Merge
|
||||
if(!$array['#'.$name]) $array['#'.$name] = '';
|
||||
}
|
||||
|
||||
// Links
|
||||
$array += $this->get_all_links('timesheet', $id, $prefix, $content);
|
||||
|
||||
// Add markers
|
||||
foreach($array as $key => &$value)
|
||||
{
|
||||
if(!$value) $value = '';
|
||||
$info['$$'.($prefix ? $prefix.'/':'').$key.'$$'] = $value;
|
||||
}
|
||||
|
||||
// Links
|
||||
$info += $this->get_all_links('timesheet', $id, $prefix, $content);
|
||||
|
||||
return $info;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user