lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: problem with development version

Browse Source
This commit is contained in:
Regis Houssin 2010-04-28 15:12:51 +00:00
parent f6ed710056
commit e2e1587206
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/modules.php
View File

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

12
htdocs/lib/admin.lib.php
View File

@ -82,9 +82,17 @@ 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)
{ {
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);
} }