Fix: problem with development version

This commit is contained in:
Regis Houssin
2010-04-30 05:29:30 +00:00
parent 004a4cbb40
commit be94ad3d07
2 changed files with 5 additions and 3 deletions

View File

@@ -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)

View File

@@ -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);
}