diff --git a/etemplate/inc/class.bo_merge.inc.php b/etemplate/inc/class.bo_merge.inc.php index 3669c5a904..fe5fe5c367 100644 --- a/etemplate/inc/class.bo_merge.inc.php +++ b/etemplate/inc/class.bo_merge.inc.php @@ -300,15 +300,15 @@ abstract class bo_merge * * Uses egw_link system to get link titles */ - protected function get_links($app, $id) + protected function get_links($app, $id, $only_app) { - $links = egw_link::get_links($app, $id); + $links = egw_link::get_links($app, $id, $only_app); $link_titles = array(); foreach($links as $link_id => $link_info) { $link_titles[] = egw_link::title($link_info['app'], $link_info['id']); } - return implode("\n",$link_titles); + return implode(", ",$link_titles); } /** diff --git a/etemplate/lang/egw_en.lang b/etemplate/lang/egw_en.lang index 8a5c06dfce..222cc17fea 100644 --- a/etemplate/lang/egw_en.lang +++ b/etemplate/lang/egw_en.lang @@ -252,6 +252,7 @@ linkentry etemplate en Link entry linklist etemplate en Link list linkstring etemplate en Link string linkto etemplate en Link to +list of files linked to the current record preferences en List of files linked to the current record load this template into the editor etemplate en Load template to the editor maximum size for uploads filemanager en Maximum upload size message ... etemplate en Message ...