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

Fix: missing search in alternative root directory

Browse Source
This commit is contained in:
Regis Houssin 2012-06-06 14:00:23 +02:00
parent 7feff22c1a
commit 54dd02413f
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -719,29 +719,35 @@ function activateModule($value,$withdeps=1)
if (! $ret && $withdeps) if (! $ret && $withdeps)
{ {
if (is_array($objMod->depends) && !empty($objMod->depends)) if (is_array($objMod->depends) && ! empty($objMod->depends))
{ {
// Activation des modules dont le module depend // Activation des modules dont le module depend
$num = count($objMod->depends); $num = count($objMod->depends);
for ($i = 0; $i < $num; $i++) for ($i = 0; $i < $num; $i++)
{ {
if (file_exists(DOL_DOCUMENT_ROOT."/core/modules/".$objMod->depends[$i].".class.php")) foreach ($modulesdir as $dir)
{ {
activateModule($objMod->depends[$i]); if (file_exists($dir.$objMod->depends[$i].".class.php"))
} {
activateModule($objMod->depends[$i]);
}
}
} }
} }
if (isset($objMod->conflictwith) && is_array($objMod->conflictwith)) if (is_array($objMod->conflictwith) && ! empty($objMod->conflictwith))
{ {
// Desactivation des modules qui entrent en conflit // Desactivation des modules qui entrent en conflit
$num = count($objMod->conflictwith); $num = count($objMod->conflictwith);
for ($i = 0; $i < $num; $i++) for ($i = 0; $i < $num; $i++)
{ {
if (file_exists(DOL_DOCUMENT_ROOT."/core/modules/".$objMod->conflictwith[$i].".class.php")) foreach ($modulesdir as $dir)
{ {
unActivateModule($objMod->conflictwith[$i],0); if (file_exists($dir.$objMod->conflictwith[$i].".class.php"))
} {
unActivateModule($objMod->conflictwith[$i],0);
}
}
} }
} }
} }