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

Merge pull request #4710 from hregis/3.9_bug

Browse Source 
Fix: issue during upgrade of MAIN_VERSION_LAST_UPGRADE (rc -> rc2)
This commit is contained in:
Laurent Destailleur 2016-03-04 15:18:59 +01:00
commit 84d2078919
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2008-2011 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2008-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2005-2016 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2012 J. Fernando Lagrange <fernando@demo-tic.org> * Copyright (C) 2012 J. Fernando Lagrange <fernando@demo-tic.org>
* Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr> * Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
* *
@ -62,12 +62,16 @@ function versioncompare($versionarray1,$versionarray2)
{ {
$operande1=isset($versionarray1[$level])?$versionarray1[$level]:0; $operande1=isset($versionarray1[$level])?$versionarray1[$level]:0;
$operande2=isset($versionarray2[$level])?$versionarray2[$level]:0; $operande2=isset($versionarray2[$level])?$versionarray2[$level]:0;
if (preg_match('/alpha|dev/i',$operande1)) $operande1=-3; if (preg_match('/alpha|dev/i',$operande1)) $operande1=-5;
if (preg_match('/alpha|dev/i',$operande2)) $operande2=-3; if (preg_match('/alpha|dev/i',$operande2)) $operande2=-5;
if (preg_match('/beta/i',$operande1)) $operande1=-2; if (preg_match('/beta$/i',$operande1)) $operande1=-4;
if (preg_match('/beta/i',$operande2)) $operande2=-2; if (preg_match('/beta$/i',$operande2)) $operande2=-4;
if (preg_match('/rc/i',$operande1)) $operande1=-1; if (preg_match('/beta([0-9])*/i',$operande1)) $operande1=-3;
if (preg_match('/rc/i',$operande2)) $operande2=-1; if (preg_match('/beta([0-9])*/i',$operande2)) $operande2=-3;
if (preg_match('/rc$/i',$operande1)) $operande1=-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',$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; }