From 1f76ff940dc59b1d85b932552ce8b81d839feafb Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Tue, 13 Dec 2022 18:23:09 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B05797=20Replace=20wrong=20config=20load?= =?UTF-8?q?=20(#338)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sources/Core/Email/EmailLaminas.php | 3 ++- sources/Core/Email/EmailSwiftMailer.php | 10 ++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/sources/Core/Email/EmailLaminas.php b/sources/Core/Email/EmailLaminas.php index eadbf984f..a0c44a36b 100644 --- a/sources/Core/Email/EmailLaminas.php +++ b/sources/Core/Email/EmailLaminas.php @@ -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 { diff --git a/sources/Core/Email/EmailSwiftMailer.php b/sources/Core/Email/EmailSwiftMailer.php index 03b2d4801..4d71ffa97 100644 --- a/sources/Core/Email/EmailSwiftMailer.php +++ b/sources/Core/Email/EmailSwiftMailer.php @@ -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); } }