From 6a63b333918a1cda193a17436728f870ad68f372 Mon Sep 17 00:00:00 2001 From: Nicolas Domenech Date: Fri, 7 Jul 2023 10:55:20 +0200 Subject: [PATCH] #348 [AdminConf] fix: modProject and task check error --- admin/setup.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/setup.php b/admin/setup.php index fd80f42..821231c 100644 --- a/admin/setup.php +++ b/admin/setup.php @@ -67,7 +67,7 @@ $now = dol_now(); $projectRefClass = empty($conf->global->PROJECT_ADDON) ? 'mod_project_simple' : $conf->global->PROJECT_ADDON; - if (!empty($conf->global->PROJECT_ADDON) && is_readable(DOL_DOCUMENT_ROOT . '/core/modules/project/' . $conf->global->PROJECT_ADDON . '.php')) { + if (!empty($projectRefClass) && is_readable(DOL_DOCUMENT_ROOT . '/core/modules/project/' . $projectRefClass . '.php')) { require_once DOL_DOCUMENT_ROOT . '/core/modules/project/' . $projectRefClass . '.php'; $modProject = new $projectRefClass(); $projectRef = $modProject->getNextValue('', null); @@ -118,7 +118,7 @@ $taskRefClass = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON; - if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT . '/core/modules/project/task/' . $conf->global->PROJECT_TASK_ADDON . '.php')) { + if (!empty($taskRefClass) && is_readable(DOL_DOCUMENT_ROOT . '/core/modules/project/task/' . $taskRefClass . '.php')) { require_once DOL_DOCUMENT_ROOT . '/core/modules/project/task/' . $conf->global->PROJECT_TASK_ADDON . '.php'; $modTask = new $taskRefClass(); $taskRef = $modTask->getNextValue('', null);