From e2e15872064e774e400907b1206c2cd67ede6136 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Wed, 28 Apr 2010 15:12:51 +0000
Subject: [PATCH] Fix: problem with development version

---
 htdocs/admin/modules.php |  2 +-
 htdocs/lib/admin.lib.php | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 2933d8e3198..5bcfa3dfa95 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -98,7 +98,7 @@ function Activate($value,$withdeps=1)
 		}
 
 		// Test if Dolibarr version ok
-		$verdol=versiondolibarrarray();
+		$verdol=versiondolibarrarray(1);
 		$vermin=$objMod->need_dolibarr_version;
 		//print 'eee'.versioncompare($verdol,$vermin).join(',',$verdol).' - '.join(',',$vermin);exit;
 		if (is_array($vermin) && versioncompare($verdol,$vermin) < 0)
diff --git a/htdocs/lib/admin.lib.php b/htdocs/lib/admin.lib.php
index 0244438a84d..f7709c8e1ed 100644
--- a/htdocs/lib/admin.lib.php
+++ b/htdocs/lib/admin.lib.php
@@ -82,9 +82,17 @@ function versionphparray()
  *	\brief      Return version Dolibarr
  *	\return     array               Tableau de version (vermajeur,vermineur,autre)
  */
-function versiondolibarrarray()
+function versiondolibarrarray($fortest=0)
 {
-	return explode('.',DOL_VERSION);
+	$dol_version = DOL_VERSION;
+	
+	if ($fortest)
+	{
+		preg_match('/^[0-9\.]+([A-Z\-]+)$/i',DOL_VERSION,$regs);
+		$dol_version = preg_replace('/'.$regs[1].'/','',DOL_VERSION);
+	}
+	
+	return explode('.',$dol_version);
 }