Skip to content
Snippets Groups Projects
Commit e62b6c1c authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Fix: Not using correct vars names

parent 213a64ed
No related branches found
No related tags found
No related merge requests found
......@@ -393,7 +393,7 @@ else
foreach ($migrationscript as $migarray)
{
$count++;
$version=preg_split('/[\.-]/',DOL_VERSION);
$version=DOL_VERSION;
$versionfrom=$migarray['from'];
$versionto=$migarray['to'];
$versionarray=preg_split('/[\.-]/',$version);
......@@ -403,7 +403,7 @@ else
$newversionfrom=preg_replace('/(\.[0-9]+)$/i','.*',$versionfrom);
$newversionto=preg_replace('/(\.[0-9]+)$/i','.*',$versionto);
$newversionfrombis='';
if (versioncompare($dolibarrversiontoarray,$version) < -2) // From x.y.z -> x.y.z+1
if (versioncompare($dolibarrversiontoarray,$versionarray) < -2) // From x.y.z -> x.y.z+1
{
$newversionfrombis=' '.$langs->trans("or").' '.$versionto;
}
......@@ -417,7 +417,7 @@ else
{
// Now we check if this is the first qualified choice
if ($allowupgrade && empty($foundrecommandedchoice) &&
(versioncompare($dolibarrversiontoarray,$dolibarrlastupgradeversionarray) > 0 || versioncompare($dolibarrversiontoarray,$version) < -2)
(versioncompare($dolibarrversiontoarray,$dolibarrlastupgradeversionarray) > 0 || versioncompare($dolibarrversiontoarray,$versionarray) < -2)
)
{
print '<br>';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment