From 29494650ccecedf5a1ded8853344aa98d1266ab2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 30 Mar 2011 19:40:28 +0000 Subject: [PATCH] Fix: release candidate was not correctly ordered. This make upgrade process fails. --- htdocs/lib/admin.lib.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/htdocs/lib/admin.lib.php b/htdocs/lib/admin.lib.php index debfbcf04d7..bce9b2c1b97 100644 --- a/htdocs/lib/admin.lib.php +++ b/htdocs/lib/admin.lib.php @@ -55,10 +55,12 @@ function versioncompare($versionarray1,$versionarray2) { $operande1=isset($versionarray1[$level])?$versionarray1[$level]:0; $operande2=isset($versionarray2[$level])?$versionarray2[$level]:0; - if (preg_match('/alpha|dev/i',$operande1)) $operande1=-2; - if (preg_match('/alpha|dev/i',$operande2)) $operande2=-2; - if (preg_match('/beta/i',$operande1)) $operande1=-1; - if (preg_match('/beta/i',$operande2)) $operande2=-1; + if (preg_match('/alpha|dev/i',$operande1)) $operande1=-3; + if (preg_match('/alpha|dev/i',$operande2)) $operande2=-3; + if (preg_match('/beta/i',$operande1)) $operande1=-2; + if (preg_match('/beta/i',$operande2)) $operande2=-2; + if (preg_match('/rc/i',$operande1)) $operande1=-1; + if (preg_match('/rc/i',$operande2)) $operande2=-1; $level++; //print 'level '.$level.' '.$operande1.'-'.$operande2.'
'; if ($operande1 < $operande2) { $ret = -$level; break; }