From 7af5c268a972989fd2d15d59169e8ea4c5f6b499 Mon Sep 17 00:00:00 2001 From: nathangray Date: Mon, 19 Jun 2017 14:32:41 -0600 Subject: [PATCH] * Infolog - make project fields available for merge Just the project fields, no elements or tables --- infolog/inc/class.infolog_merge.inc.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/infolog/inc/class.infolog_merge.inc.php b/infolog/inc/class.infolog_merge.inc.php index db69894afb..e3f6126c29 100644 --- a/infolog/inc/class.infolog_merge.inc.php +++ b/infolog/inc/class.infolog_merge.inc.php @@ -149,7 +149,12 @@ class infolog_merge extends Api\Storage\Merge $array['project'] = Link::title('projectmanager', $app_id); break; } - + if (strpos($content, '$$project/') !== false && $array['pm_id'] && class_exists('projectmanager_merge')) + { + $pm_merge = new projectmanager_merge($array['pm_id']); + $info += $pm_merge->projectmanager_replacements($array['pm_id'],'project',$content); + } + // Add markers foreach($array as $key => &$value) {