holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do no close the session before sending, if we have to store the send text for infolog or other integration in the session

Browse Source
This commit is contained in:
Ralf Becker 2018-10-08 11:30:20 +02:00
parent bcbd7d9a4c
commit 67aa825d33
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/inc/class.mail_compose.inc.php
View File

@ -504,7 +504,6 @@ class mail_compose
{ {
try try
{ {
$GLOBALS['egw']->session->commit_session();
$success = $this->send($_content); $success = $this->send($_content);
if ($success==false) if ($success==false)
{ {
@ -3162,6 +3161,11 @@ class mail_compose
//error_log("Folder:".count(array($this->sessionData['folder']))."To:".count((array)$this->sessionData['to'])."CC:". count((array)$this->sessionData['cc']) ."bcc:".count((array)$this->sessionData['bcc'])); //error_log("Folder:".count(array($this->sessionData['folder']))."To:".count((array)$this->sessionData['to'])."CC:". count((array)$this->sessionData['cc']) ."bcc:".count((array)$this->sessionData['bcc']));
if(count((array)$this->sessionData['to']) > 0 || count((array)$this->sessionData['cc']) > 0 || count((array)$this->sessionData['bcc']) > 0) { if(count((array)$this->sessionData['to']) > 0 || count((array)$this->sessionData['cc']) > 0 || count((array)$this->sessionData['bcc']) > 0) {
try { try {
// do no close the session before sending, if we have to store the send text for infolog or other integration in the session
if (!($_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on' || $_formData['to_calendar'] == 'on' ))
{
$GLOBALS['egw']->session->commit_session();
}
$mail->send(); $mail->send();
} }
catch(Exception $e) { catch(Exception $e) {