From 4c9273f70de6b55b0805cb91e93b2cb1d5a2e041 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Thu, 4 Oct 2018 11:17:06 -0600
Subject: [PATCH] * Infolog, Timesheet - Fix link title placeholders not
 working

---
 infolog/inc/class.infolog_merge.inc.php     | 6 +++---
 timesheet/inc/class.timesheet_merge.inc.php | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/infolog/inc/class.infolog_merge.inc.php b/infolog/inc/class.infolog_merge.inc.php
index 6a206a3e68..e8d16e15b6 100644
--- a/infolog/inc/class.infolog_merge.inc.php
+++ b/infolog/inc/class.infolog_merge.inc.php
@@ -121,9 +121,6 @@ class infolog_merge extends Api\Storage\Merge
 			}
 		}
 
-		// Links
-		$array += $this->get_all_links('infolog', $id, $prefix, $content);
-
 		// Timesheet time
 		if(strpos($content, 'info_sum_timesheets'))
 		{
@@ -153,6 +150,9 @@ class infolog_merge extends Api\Storage\Merge
 			$info['$$'.($prefix ? $prefix.'/':'').$key.'$$'] = $value;
 		}
 
+		// Links
+		$info += $this->get_all_links('infolog', $id, $prefix, $content);
+
 		// Add contact fields
 		if($array['info_link'] && $array['info_link']['app'] && $array['info_link']['id'])
 		{
diff --git a/timesheet/inc/class.timesheet_merge.inc.php b/timesheet/inc/class.timesheet_merge.inc.php
index a50002bbb6..1095caeaff 100644
--- a/timesheet/inc/class.timesheet_merge.inc.php
+++ b/timesheet/inc/class.timesheet_merge.inc.php
@@ -139,15 +139,16 @@ class timesheet_merge extends Api\Storage\Merge
 			if(!$array['#'.$name]) $array['#'.$name] = '';
 		}
 
-		// Links
-		$array += $this->get_all_links('timesheet', $id, $prefix, $content);
-
 		// Add markers
 		foreach($array as $key => &$value)
 		{
 			if(!$value) $value = '';
 			$info['$$'.($prefix ? $prefix.'/':'').$key.'$$'] = $value;
 		}
+
+		// Links
+		$info += $this->get_all_links('timesheet', $id, $prefix, $content);
+
 		return $info;
 	}