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

Better fix to manage several level of beta and rc

Browse Source
This commit is contained in:
Laurent Destailleur 2016-03-04 15:21:26 +01:00
parent 84d2078919
commit e92318bc13
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/lib/admin.lib.php
View File

@ -66,12 +66,12 @@ function versioncompare($versionarray1,$versionarray2)
if (preg_match('/alpha|dev/i',$operande2)) $operande2=-5; if (preg_match('/alpha|dev/i',$operande2)) $operande2=-5;
if (preg_match('/beta$/i',$operande1)) $operande1=-4; if (preg_match('/beta$/i',$operande1)) $operande1=-4;
if (preg_match('/beta$/i',$operande2)) $operande2=-4; if (preg_match('/beta$/i',$operande2)) $operande2=-4;
if (preg_match('/beta([0-9])*/i',$operande1)) $operande1=-3; if (preg_match('/beta([0-9])+/i',$operande1)) $operande1=-3;
if (preg_match('/beta([0-9])*/i',$operande2)) $operande2=-3; if (preg_match('/beta([0-9])+/i',$operande2)) $operande2=-3;
if (preg_match('/rc$/i',$operande1)) $operande1=-2; if (preg_match('/rc$/i',$operande1)) $operande1=-2;
if (preg_match('/rc$/i',$operande2)) $operande2=-2; if (preg_match('/rc$/i',$operande2)) $operande2=-2;
if (preg_match('/rc([0-9])*/i',$operande1)) $operande1=-1; if (preg_match('/rc([0-9])+/i',$operande1)) $operande1=-1;
if (preg_match('/rc([0-9])*/i',$operande2)) $operande2=-1; if (preg_match('/rc([0-9])+/i',$operande2)) $operande2=-1;
$level++; $level++;
//print 'level '.$level.' '.$operande1.'-'.$operande2.'<br>'; //print 'level '.$level.' '.$operande1.'-'.$operande2.'<br>';
if ($operande1 < $operande2) { $ret = -$level; break; } if ($operande1 < $operande2) { $ret = -$level; break; }