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

Merge pull request #6428 from laudeco/fix/enable_module_with_dependencies

Browse Source 
fix the enabling of a dependency module already ON
This commit is contained in:
Laurent Destailleur 2017-02-17 10:47:29 +01:00 committed by GitHub
commit c61c13d9fd
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/core/lib/admin.lib.php
View File

@ -763,6 +763,11 @@ function activateModule($value,$withdeps=1)
return $ret;
}
$const_name = $objMod->const_name;
if(!empty($conf->global->$const_name)){
return $ret;
}
$result=$objMod->init();
if ($result <= 0)
{
@ -784,7 +789,13 @@ function activateModule($value,$withdeps=1)
if (file_exists($dir.$objMod->depends[$i].".class.php"))
{
$resarray = activateModule($objMod->depends[$i]);
if (empty($resarray['errors'])) $activate = true;
if (empty($resarray['errors'])){
$activate = true;
}else{
foreach ($resarray['errors'] as $errorMessage){
dol_syslog($errorMessage, LOG_ERR);
}
}
break;
}
}