From 56376743154a1d4ff539a1fc111bda300c7c21ee Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 23 Aug 2012 10:26:43 +0000
Subject: [PATCH] * mergeprint: fix problem with not replaced app-links like
 #contact/nfn; fix problem with not replaced date only option on date/datetime
 customfields

---
 etemplate/inc/class.bo_merge.inc.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/etemplate/inc/class.bo_merge.inc.php b/etemplate/inc/class.bo_merge.inc.php
index 8f544dbc38..a7dc6dc5c2 100644
--- a/etemplate/inc/class.bo_merge.inc.php
+++ b/etemplate/inc/class.bo_merge.inc.php
@@ -1158,7 +1158,7 @@ abstract class bo_merge
 
 		foreach($cf as $index => $field)
 		{
-			if($cfs[$field] && in_array($cfs[$field]['type'],$GLOBALS['egw_info']['apps']) )
+			if($cfs[$field] && in_array($cfs[$field]['type'],array_keys($GLOBALS['egw_info']['apps'])) )
 			{
 				// Get replacements for that application
 				$field_app = $cfs[$field]['type'];
@@ -1173,6 +1173,10 @@ abstract class bo_merge
 				}
 				$replacements[$placeholders[$index]] = $app_replacements[$field_app]['$$'.$sub[$index].'$$'];
 			}
+			else
+			{
+				if ($cfs[$field]['type'] == 'date' || $cfs[$field]['type'] == 'date-time') $this->date_fields[] = '#'.$field;
+			}
 		}
 	}