From 65bd53f5edd8ebea87119cca3ed3440d0171c5e0 Mon Sep 17 00:00:00 2001
From: hahn <axel.hahn@iml.unibe.ch>
Date: Wed, 27 Jul 2022 14:48:13 +0200
Subject: [PATCH] update config reader
---
config/inc_projects_config.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/config/inc_projects_config.php b/config/inc_projects_config.php
index 1d979444..0345ab7a 100644
--- a/config/inc_projects_config.php
+++ b/config/inc_projects_config.php
@@ -1,7 +1,7 @@
<?php
$aConfig = include('config_defaults.php');
-if (file_exists('config_custom.php')){
+if (file_exists(__DIR__.'/config_custom.php')){
$aConfig = array_replace_recursive(
$aConfig,
include('config_custom.php')
@@ -13,8 +13,8 @@ if (file_exists('config_custom.php')){
// ----------------------------------------------------------------------
$aConfig = array_merge($aConfig, [
- 'appRootDir' => dirname(dirname(__FILE__)),
- 'configDir' => dirname(__FILE__),
+ 'appRootDir' => dirname(__DIR__),
+ 'configDir' => __DIR__,
'dataDir' => $aConfig['workDir'] . '/data', // to write data: ssh keys, projects, database
'buildDir' => $aConfig['workDir'] . '/build',
'buildDefaultsDir' => $aConfig['workDir'] . '/defaults',
--
GitLab