holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix links/[app] merge tag - copy/paste error

Browse Source
This commit is contained in:
Nathan Gray 2012-01-13 19:49:19 +00:00
parent b0f211f40b
commit 871701d774
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addressbook/inc/class.addressbook_merge.inc.php
View File

@ -56,7 +56,7 @@ class addressbook_merge extends bo_merge
); );
foreach(array_keys($GLOBALS['egw_info']['user']['apps']) as $app) 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)) if (!(strpos($content,'$$calendar/') === false))
{ {

2
calendar/inc/class.calendar_merge.inc.php
View File

@ -214,7 +214,7 @@ class calendar_merge extends bo_merge
$replacements['$$'.($prefix?$prefix.'/':'').'links_attachments$$'] = $this->get_links('calendar', $event['id']); $replacements['$$'.($prefix?$prefix.'/':'').'links_attachments$$'] = $this->get_links('calendar', $event['id']);
foreach(array_keys($GLOBALS['egw_info']['user']['apps']) as $app) 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; return $replacements;

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

@ -130,7 +130,7 @@ class timesheet_merge extends bo_merge
$array['links_attachments'] = $this->get_links('timesheet', $id); $array['links_attachments'] = $this->get_links('timesheet', $id);
foreach(array_keys($GLOBALS['egw_info']['user']['apps']) as $app) 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 // Add markers