From 757b3d1cc33b9b752c0e8f6bcbeb81f15acd6c08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 16 Jan 2018 10:41:47 +0000
Subject: [PATCH] =?UTF-8?q?Retrofit=20from=20trunk=20N=C2=B01224=20-=20The?=
 =?UTF-8?q?=202.4.x=20setup=20keep=20the=20selected=20choices=20from=20a?=
 =?UTF-8?q?=201.3.x=20version.=20*=20The=20selection=20is=20kept=20even=20?=
 =?UTF-8?q?if=20the=20extension=20has=20a=20one=20more=20module=20than=20t?=
 =?UTF-8?q?he=201.3.x=20[from=20revision=205252]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

SVN:2.4[5253]
---
 setup/wizardsteps.class.inc.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/setup/wizardsteps.class.inc.php b/setup/wizardsteps.class.inc.php
index a8b5fec8c1..dc573a4051 100644
--- a/setup/wizardsteps.class.inc.php
+++ b/setup/wizardsteps.class.inc.php
@@ -1491,7 +1491,12 @@ EOF
 						$aScores[$sChoiceId][$sModuleId] = true;
 					}
 				}
-				if (count($aScores[$sChoiceId]) == count($aChoice['modules']))
+				// Used for migration from 1.3.x or before
+				// Accept that the new version can have one new module than the previous version
+				// The option is still selected
+				$iSelected = count($aScores[$sChoiceId]);
+				$iNeeded = count($aChoice['modules']);
+				if (($iSelected > 0) && (($iNeeded - $iSelected) < 2))
 				{
 					// All the modules are installed, this choice is selected
 					$aDefaults[$sChoiceId] = $sChoiceId;