From 1f76ff940dc59b1d85b932552ce8b81d839feafb Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Tue, 13 Dec 2022 18:23:09 +0100
Subject: [PATCH 1/2] =?UTF-8?q?N=C2=B05797=20Replace=20wrong=20config=20lo?=
 =?UTF-8?q?ad=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);
 			}
 		}

From 7c2f8f4d9361711492dda7aa9beeea18273321f3 Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Wed, 14 Dec 2022 09:33:54 +0100
Subject: [PATCH 2/2] =?UTF-8?q?N=C2=B05765=20-=20Setup:=20Never=20cache=20?=
 =?UTF-8?q?folder=20permissions=20test=20response=20(#374)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup/setup.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup/setup.js b/setup/setup.js
index 62ae1b733..7d915606a 100644
--- a/setup/setup.js
+++ b/setup/setup.js
@@ -54,8 +54,8 @@ function ExecuteStep(sStep)
 }
 
 function CheckDirectoryConfFilesPermissions(sWikiVersion){
-	$.ajax('permissions-test-folder/permissions-test-subfolder/permissions-test-file',
-		{
+	$.ajax('permissions-test-folder/permissions-test-subfolder/permissions-test-file', {
+		cache: false,
 		statusCode: {
 			200: function() {
 				$('#details').prepend('<div class="message message-warning"><span class="message-title">Security issue:</span> iTop is bundled with directory-level configuration files. You must check that those files will be read by your web server (eg.' +