From b13ccf631cb99e737654bdad248c3f683c70a84b Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 20 Mar 2013 14:51:09 +0000
Subject: [PATCH] Add {{link}} placeholder to other apps

---
 addressbook/inc/class.addressbook_merge.inc.php | 1 +
 calendar/inc/class.calendar_merge.inc.php       | 1 +
 timesheet/inc/class.timesheet_merge.inc.php     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/addressbook/inc/class.addressbook_merge.inc.php b/addressbook/inc/class.addressbook_merge.inc.php
index 72d0cefd86..1ac17a9a2e 100644
--- a/addressbook/inc/class.addressbook_merge.inc.php
+++ b/addressbook/inc/class.addressbook_merge.inc.php
@@ -185,6 +185,7 @@ class addressbook_merge extends bo_merge
 
 		echo '<tr><td colspan="4"><h3>'.lang('General fields:')."</h3></td></tr>";
 		foreach(array(
+			'link' => lang('HTML link to the current record'),
 			'links' => lang('Titles of any entries linked to the current record, excluding attached files'),
  			'attachments' => lang('List of files linked to the current record'),
 			'links_attachments' => lang('Links and attached files'),
diff --git a/calendar/inc/class.calendar_merge.inc.php b/calendar/inc/class.calendar_merge.inc.php
index 16ad123e1c..441f5ee228 100644
--- a/calendar/inc/class.calendar_merge.inc.php
+++ b/calendar/inc/class.calendar_merge.inc.php
@@ -578,6 +578,7 @@ class calendar_merge extends bo_merge
 
 		echo '<tr><td colspan="4"><h3>'.lang('General fields:')."</h3></td></tr>";
 		foreach(array(
+			'link' => lang('HTML link to the current record'),
 			'links' => lang('Titles of any entries linked to the current record, excluding attached files'),
 			'attachments' => lang('List of files linked to the current record'),
 			'links_attachments' => lang('Links and attached files'),
diff --git a/timesheet/inc/class.timesheet_merge.inc.php b/timesheet/inc/class.timesheet_merge.inc.php
index 3f19425ace..c50a3f68dd 100644
--- a/timesheet/inc/class.timesheet_merge.inc.php
+++ b/timesheet/inc/class.timesheet_merge.inc.php
@@ -196,6 +196,7 @@ class timesheet_merge extends bo_merge
 
 		echo '<tr><td colspan="4"><h3>'.lang('General fields:')."</h3></td></tr>";
 		foreach(array(
+			'link' => lang('HTML link to the current record'),
 			'links' => lang('Titles of any entries linked to the current record, excluding attached files'),
  			'attachments' => lang('List of files linked to the current record'),
 			'links_attachments' => lang('Links and attached files'),