From 28e54a01e56e9d264b37ebb29be3e3e2d25c3607 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Thu, 17 Oct 2013 11:52:16 +0000 Subject: [PATCH] * eMail: fix problem with lost connection on drafted message when using printPreview on messages with attachments --- felamimail/inc/class.uicompose.inc.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/felamimail/inc/class.uicompose.inc.php b/felamimail/inc/class.uicompose.inc.php index d02813a1b5..ebb800670a 100644 --- a/felamimail/inc/class.uicompose.inc.php +++ b/felamimail/inc/class.uicompose.inc.php @@ -148,6 +148,8 @@ return; } $uidisplay = CreateObject('felamimail.uidisplay'); + // since we reuse the bofelamimail object, an open connection may not be reusable + if ($uidisplay->bofelamimail->icServer->_connected == 1) $uidisplay->bofelamimail->closeConnection(); $uidisplay->printMessage($messageUid, $formData['printit'],$destinationFolder); //egw::link('/index.php',array('menuaction' => 'felamimail.uidisplay.printMessage','uid'=>$messageUid)); return; @@ -350,7 +352,7 @@ $GLOBALS['egw_info']['server']['contact_repository'] == 'sql') { $accounts = $GLOBALS['egw']->contacts->search($_searchCond,array('n_fn','email','email_home'),'n_fn','','%',false,'OR',array(0,100),array('owner' => 0)); - + if ($contacts && $accounts) { $contacts = array_merge($contacts,$accounts);