lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Not using correct vars names

Browse Source
This commit is contained in:
Laurent Destailleur 2014-02-10 16:09:21 +01:00
parent 213a64edcc
commit e62b6c1cc4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/install/check.php
View File

@ -393,7 +393,7 @@ else
foreach ($migrationscript as $migarray) foreach ($migrationscript as $migarray)
{ {
$count++; $count++;
$version=preg_split('/[\.-]/',DOL_VERSION); $version=DOL_VERSION;
$versionfrom=$migarray['from']; $versionfrom=$migarray['from'];
$versionto=$migarray['to']; $versionto=$migarray['to'];
$versionarray=preg_split('/[\.-]/',$version); $versionarray=preg_split('/[\.-]/',$version);
@ -403,7 +403,7 @@ else
$newversionfrom=preg_replace('/(\.[0-9]+)$/i','.*',$versionfrom); $newversionfrom=preg_replace('/(\.[0-9]+)$/i','.*',$versionfrom);
$newversionto=preg_replace('/(\.[0-9]+)$/i','.*',$versionto); $newversionto=preg_replace('/(\.[0-9]+)$/i','.*',$versionto);
$newversionfrombis=''; $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; $newversionfrombis=' '.$langs->trans("or").' '.$versionto;
} }
@ -417,7 +417,7 @@ else
{ {
// Now we check if this is the first qualified choice // Now we check if this is the first qualified choice
if ($allowupgrade && empty($foundrecommandedchoice) && if ($allowupgrade && empty($foundrecommandedchoice) &&
(versioncompare($dolibarrversiontoarray,$dolibarrlastupgradeversionarray) > 0 || versioncompare($dolibarrversiontoarray,$version) < -2) (versioncompare($dolibarrversiontoarray,$dolibarrlastupgradeversionarray) > 0 || versioncompare($dolibarrversiontoarray,$versionarray) < -2)
) )
{ {
print '<br>'; print '<br>';