Skip to content
Snippets Groups Projects
Commit be94ad3d authored by Regis Houssin's avatar Regis Houssin
Browse files

Fix: problem with development version

parent 004a4cbb
Branches
No related tags found
No related merge requests found
...@@ -98,7 +98,7 @@ function Activate($value,$withdeps=1) ...@@ -98,7 +98,7 @@ function Activate($value,$withdeps=1)
} }
// Test if Dolibarr version ok // Test if Dolibarr version ok
$verdol=versiondolibarrarray(); $verdol=versiondolibarrarray(1);
$vermin=$objMod->need_dolibarr_version; $vermin=$objMod->need_dolibarr_version;
//print 'eee'.versioncompare($verdol,$vermin).join(',',$verdol).' - '.join(',',$vermin);exit; //print 'eee'.versioncompare($verdol,$vermin).join(',',$verdol).' - '.join(',',$vermin);exit;
if (is_array($vermin) && versioncompare($verdol,$vermin) < 0) if (is_array($vermin) && versioncompare($verdol,$vermin) < 0)
......
...@@ -82,10 +82,12 @@ function versionphparray() ...@@ -82,10 +82,12 @@ function versionphparray()
* \brief Return version Dolibarr * \brief Return version Dolibarr
* \return array Tableau de version (vermajeur,vermineur,autre) * \return array Tableau de version (vermajeur,vermineur,autre)
*/ */
function versiondolibarrarray() function versiondolibarrarray($fortest=0)
{ {
$dol_version = DOL_VERSION;
// Used for development 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); return explode('.',$dol_version);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment