forked from extern/egroupware
Fix links/[app] merge tag - copy/paste error
This commit is contained in:
parent
b0f211f40b
commit
871701d774
@ -56,7 +56,7 @@ class addressbook_merge extends bo_merge
|
||||
);
|
||||
foreach(array_keys($GLOBALS['egw_info']['user']['apps']) as $app)
|
||||
{
|
||||
$array['$$links/'.$app.'$$'] = $this->get_links('addressbook',$id, $app);
|
||||
$replacements['$$links/'.$app.'$$'] = $this->get_links('addressbook',$id, $app);
|
||||
}
|
||||
if (!(strpos($content,'$$calendar/') === false))
|
||||
{
|
||||
|
@ -214,7 +214,7 @@ class calendar_merge extends bo_merge
|
||||
$replacements['$$'.($prefix?$prefix.'/':'').'links_attachments$$'] = $this->get_links('calendar', $event['id']);
|
||||
foreach(array_keys($GLOBALS['egw_info']['user']['apps']) as $app)
|
||||
{
|
||||
$array["$$".($prefix?$prefix.'/':'')."links/{$app}$$"] = $this->get_links('calendar',$id, $app);
|
||||
$replacements["$$".($prefix?$prefix.'/':'')."links/{$app}$$"] = $this->get_links('calendar',$id, $app);
|
||||
}
|
||||
|
||||
return $replacements;
|
||||
|
@ -130,7 +130,7 @@ class timesheet_merge extends bo_merge
|
||||
$array['links_attachments'] = $this->get_links('timesheet', $id);
|
||||
foreach(array_keys($GLOBALS['egw_info']['user']['apps']) as $app)
|
||||
{
|
||||
$array["$$".($prefix?$prefix.'/':'')."links/{$app}$$"] = $this->get_links('timesheet',$id, $app);
|
||||
$array["links/{$app}"] = $this->get_links('timesheet',$id, $app);
|
||||
}
|
||||
|
||||
// Add markers
|
||||
|
Loading…
Reference in New Issue
Block a user