composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'support/2.7' into support/3.0

Browse Source
This commit is contained in:
Eric Espie
2022-12-14 15:45:27 +01:00
parent 296ee019a0 7c2f8f4d93
commit e1c28a5c22
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sources/Core/Email/EmailLaminas.php
View File

@@ -315,7 +315,8 @@ class EMailLaminas extends Email
if ($bForceSynchronous) {
return $this->SendSynchronous($aIssues, $oLog);
} else {
$bConfigASYNC = MetaModel::GetConfig()->Get('email_asynchronous');
$oConfig = $this->LoadConfig();
$bConfigASYNC = $oConfig->Get('email_asynchronous');
if ($bConfigASYNC) {
return $this->SendAsynchronous($aIssues, $oLog);
} else {

10
sources/Core/Email/EmailSwiftMailer.php
View File

@@ -273,13 +273,11 @@ class EmailSwiftMailer extends EMail
}
else
{
$bConfigASYNC = MetaModel::GetConfig()->Get('email_asynchronous');
if ($bConfigASYNC)
{
$oConfig = $this->LoadConfig();
$bConfigASYNC = $oConfig->Get('email_asynchronous');
if ($bConfigASYNC) {
return $this->SendAsynchronous($aIssues, $oLog);
}
else
{
} else {
return $this->SendSynchronous($aIssues, $oLog);
}
}