extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-25 08:09:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Infolog, Timesheet - Fix link title placeholders not working

Browse Source
This commit is contained in:
nathangray 2018-10-04 11:17:06 -06:00
parent cceba01f87
commit d5cf6a600f
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
infolog/inc/class.infolog_merge.inc.php
View File

@ -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'])
{

7
timesheet/inc/class.timesheet_merge.inc.php
View File

@ -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;
}