From 2bc61caab1fcc7b69de46452bfd78e8db31ba6aa Mon Sep 17 00:00:00 2001
From: Eric <eric.espie@combodo.com>
Date: Thu, 19 Aug 2021 12:14:14 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B04207=20N=C2=B04298=20Fix=20data/.mainten?=
 =?UTF-8?q?ance=20flag=20not=20removed=20by=20setup=20anymore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Was already fixed in the develop branch
(cherry picked from commit d0986c048a8db6d160a550e3ae577e2cabe0a6e1)
(cherry picked from commit 9126635cf25e0e6d3eff3a8859533d49f83b50bc)
---
 setup/ajax.dataloader.php       | 3 ++-
 setup/wizardsteps.class.inc.php | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/setup/ajax.dataloader.php b/setup/ajax.dataloader.php
index 1cb5a51e1..3e296cb18 100644
--- a/setup/ajax.dataloader.php
+++ b/setup/ajax.dataloader.php
@@ -32,7 +32,8 @@
  * 'file': string Name of the file to load
  * 'session_status': string 'start', 'continue' or 'end'
  * 'percent': integer 0..100 the percentage of completion once the file has been loaded 
- */ 
+ */
+$bBypassMaintenance = true; // Reset maintenance mode in case of problem
 define('SAFE_MINIMUM_MEMORY', 64*1024*1024);
 require_once('../approot.inc.php');
 require_once(APPROOT.'/application/utils.inc.php');
diff --git a/setup/wizardsteps.class.inc.php b/setup/wizardsteps.class.inc.php
index e9b40cbef..aa399b19a 100644
--- a/setup/wizardsteps.class.inc.php
+++ b/setup/wizardsteps.class.inc.php
@@ -2665,6 +2665,9 @@ class WizStepDone extends WizardStep
 		$oPage->add('<img style="border:0" src="'.$sImgUrl.'"/>');
 		$sForm = addslashes($sForm);
 		$oPage->add_ready_script("$('#wiz_form').after('$sForm');");
+		// avoid leaving in a dirty state
+		SetupUtils::ExitMaintenanceMode(false);
+		SetupUtils::ExitReadOnlyMode(false);
 		SetupUtils::EraseSetupToken();
 	}