diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 5bcfa3dfa95..2933d8e3198 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(1); + $verdol=versiondolibarrarray(); $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 f7709c8e1ed..64f93fd27be 100644 --- a/htdocs/lib/admin.lib.php +++ b/htdocs/lib/admin.lib.php @@ -82,15 +82,12 @@ function versionphparray() * \brief Return version Dolibarr * \return array Tableau de version (vermajeur,vermineur,autre) */ -function versiondolibarrarray($fortest=0) +function versiondolibarrarray() { $dol_version = DOL_VERSION; - if ($fortest) - { - preg_match('/^[0-9\.]+([A-Z\-]+)$/i',DOL_VERSION,$regs); - $dol_version = preg_replace('/'.$regs[1].'/','',DOL_VERSION); - } + preg_match('/^[0-9\.]+([A-Z\-]+)$/i',DOL_VERSION,$regs); + $dol_version = preg_replace('/'.$regs[1].'/','',DOL_VERSION); return explode('.',$dol_version); }