From e92318bc134efa8803fecfa4a264a5349d3c6112 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Mar 2016 15:21:26 +0100
Subject: [PATCH] Better fix to manage several level of beta and rc
---
htdocs/core/lib/admin.lib.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 812c5de4ead..5c6b9613c17 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -66,12 +66,12 @@ function versioncompare($versionarray1,$versionarray2)
if (preg_match('/alpha|dev/i',$operande2)) $operande2=-5;
if (preg_match('/beta$/i',$operande1)) $operande1=-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',$operande2)) $operande2=-3;
+ if (preg_match('/beta([0-9])+/i',$operande1)) $operande1=-3;
+ 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;
+ if (preg_match('/rc([0-9])+/i',$operande1)) $operande1=-1;
+ if (preg_match('/rc([0-9])+/i',$operande2)) $operande2=-1;
$level++;
//print 'level '.$level.' '.$operande1.'-'.$operande2.'<br>';
if ($operande1 < $operande2) { $ret = -$level; break; }
--
GitLab