New: add directory for external module and other customization

This commit is contained in:
Regis Houssin 2010-12-15 09:54:07 +00:00
parent 107c67d106
commit ad1b768749

View File

@ -589,7 +589,10 @@ function Activate($value,$withdeps=1)
// Loop on each directory // Loop on each directory
foreach ($conf->file->dol_document_root as $dol_document_root) foreach ($conf->file->dol_document_root as $dol_document_root)
{ {
$found=@include_once($dol_document_root."/includes/modules/".$file); if (preg_match('/custom$/i',$dol_document_root)) $dir = $dol_document_root . "/modules/";
else $dir = $dol_document_root."/includes/modules/";
$found=@include_once($dir.$file);
if ($found) break; if ($found) break;
} }
@ -675,7 +678,10 @@ function UnActivate($value,$requiredby=1)
// Loop on each directory // Loop on each directory
foreach ($conf->file->dol_document_root as $dol_document_root) foreach ($conf->file->dol_document_root as $dol_document_root)
{ {
$found=@include_once($dol_document_root."/includes/modules/".$file); if (preg_match('/custom$/i',$dol_document_root)) $dir = $dol_document_root . "/modules/";
else $dir = $dol_document_root."/includes/modules/";
$found=@include_once($dir.$file);
if ($found) break; if ($found) break;
} }