From 51c6e7947579999b8fdad7719765241436b4c691 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Thu, 30 Jun 2011 11:21:48 +0000 Subject: [PATCH] allow email - merge print only for addressbook (by now); handle mergeprint for accounts stored with ldap as well --- etemplate/inc/class.bo_merge.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etemplate/inc/class.bo_merge.inc.php b/etemplate/inc/class.bo_merge.inc.php index a5d33e2e11..703307dba5 100644 --- a/etemplate/inc/class.bo_merge.inc.php +++ b/etemplate/inc/class.bo_merge.inc.php @@ -118,7 +118,8 @@ abstract class bo_merge case 'application/xml': return true; // alias for text/xml, eg. ms office 2003 word format case 'message/rfc822': - return true; // ToDo: check if you are theoretical able to send mail + if ($GLOBALS['egw_info']['flags']['currentapp'] == 'addressbook') return true; // ToDo: check if you are theoretical able to send mail + else break; default: if (substr($mimetype,0,5) == 'text/') {