From 18ca0470b2cccc50efd25a576d673624e068ccc4 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 2 Apr 2012 22:14:15 +0000
Subject: [PATCH] Merged links are always external

---
 etemplate/inc/class.bo_merge.inc.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/etemplate/inc/class.bo_merge.inc.php b/etemplate/inc/class.bo_merge.inc.php
index ae6365c9c9..efd8865f19 100644
--- a/etemplate/inc/class.bo_merge.inc.php
+++ b/etemplate/inc/class.bo_merge.inc.php
@@ -345,11 +345,12 @@ abstract class bo_merge
 				$link = egw_link::view($link_info['app'], $link_info['id'], $link_info);
 				if($link_info['app'] != egw_link::VFS_APPNAME)
 				{
-					$link = str_replace(',','%2C',egw::link('/index.php',$link, $link_info['app']));
+					// Set app to false so we always get an external link
+					$link = str_replace(',','%2C',egw::link('/index.php',$link, false));
 				}
 				else
 				{
-					$link = egw::link($link);
+					$link = egw::link($link, array());
 				}
 				// Prepend site
 				if ($link{0} == '/')