From be94ad3d0720175c20bb05aafb54d79aced9f467 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 30 Apr 2010 05:29:30 +0000 Subject: [PATCH] Fix: problem with development version --- htdocs/admin/modules.php | 2 +- htdocs/lib/admin.lib.php | 6 ++++-- 2 files changed, 5 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 3025885fa5c..38f7665e927 100644 --- a/htdocs/lib/admin.lib.php +++ b/htdocs/lib/admin.lib.php @@ -82,10 +82,12 @@ function versionphparray() * \brief Return version Dolibarr * \return array Tableau de version (vermajeur,vermineur,autre) */ -function versiondolibarrarray() +function versiondolibarrarray($fortest=0) { + $dol_version = DOL_VERSION; + // Used for development version - $dol_version = preg_replace('/([A-Z\-]+)$/i','',DOL_VERSION); + if ($fortest) $dol_version = preg_replace('/([A-Z\-]+)$/i','',DOL_VERSION); return explode('.',$dol_version); }