extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-23 05:41:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

* eMail: fix problem with lost connection on drafted message when using printPreview on messages with attachments

Browse Source
This commit is contained in:
Klaus Leithoff 2013-10-17 11:52:16 +00:00
parent 74f27b0f90
commit 28e54a01e5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
felamimail/inc/class.uicompose.inc.php
View File

@ -148,6 +148,8 @@
return; return;
} }
$uidisplay = CreateObject('felamimail.uidisplay'); $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); $uidisplay->printMessage($messageUid, $formData['printit'],$destinationFolder);
//egw::link('/index.php',array('menuaction' => 'felamimail.uidisplay.printMessage','uid'=>$messageUid)); //egw::link('/index.php',array('menuaction' => 'felamimail.uidisplay.printMessage','uid'=>$messageUid));
return; return;
@ -350,7 +352,7 @@
$GLOBALS['egw_info']['server']['contact_repository'] == 'sql') $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)); $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) if ($contacts && $accounts)
{ {
$contacts = array_merge($contacts,$accounts); $contacts = array_merge($contacts,$accounts);