From fa9e21a4671517a25d0a01c76b66eb78134a7d73 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 10 Mar 2008 01:25:34 +0000 Subject: [PATCH] Change to add possibility to have two root directory (for dev of modules) --- htdocs/admin/modules.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 80ff2417da0..201e65b414d 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -75,7 +75,9 @@ function Activate($value,$withdeps=1) if ($modName) { $file = $modName . ".class.php"; - include_once(DOL_DOCUMENT_ROOT."/includes/modules/".$file); + $res=@include_once(DOL_DOCUMENT_ROOT."/includes/modules/".$file); + if (defined('DOL_DOCUMENT_ROOT_BIS') && ! $res) include_once(DOL_DOCUMENT_ROOT_BIS."/includes/modules/".$file); + $objMod = new $modName($db); // Test si version PHP ok @@ -134,7 +136,9 @@ function UnActivate($value,$requiredby=1) if ($modName) { $file = $modName . ".class.php"; - include_once(DOL_DOCUMENT_ROOT."/includes/modules/$file"); + $res=include_once(DOL_DOCUMENT_ROOT."/includes/modules/".$file); + if (defined('DOL_DOCUMENT_ROOT_BIS') && ! $res) include_once(DOL_DOCUMENT_ROOT_BIS."/includes/modules/".$file); + $objMod = new $modName($db); $result=$objMod->remove(); }