#348 [AdminConf] fix: modProject and task check error

Evarisk · Jul 7, 2023 · 6a63b33 · 6a63b33
1 parent 95071f7
commit 6a63b33
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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);