From 5b547fa5e7e520740311735a0c4fd1d64a87ae5b Mon Sep 17 00:00:00 2001
From: Stein Magne Bjorklund <steinmb@smbjorklund.com>
Date: Fri, 17 Sep 2021 12:06:17 +0200
Subject: [PATCH] Inverted dependencies in application default settings
Application default settings cannot have dependencies
on the local user provided settings.
---
common.inc.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/common.inc.php b/common.inc.php
index 7a4003dc..7381c8fe 100644
--- a/common.inc.php
+++ b/common.inc.php
@@ -79,6 +79,8 @@ $conf['modules']['available'] = array('static','service', 'type');
//$conf['modules']['available'] = array('session', 'static','uri', 'type', 'service');
$conf['admin']['pass'] = 'admin';
+$conf['view']['standard']['baseUrl'] = '';
+$conf['basedir'] = '';
global $lodspk;
$lodspk['maxResults'] = 1000;
@@ -86,5 +88,3 @@ $lodspk['maxResults'] = 1000;
if (file_exists(LOADSPEAKR_ROOT . '/settings.inc.php')) {
require_once LOADSPEAKR_ROOT . '/settings.inc.php';
}
-
-$conf['view']['standard']['baseUrl'] = $conf['basedir'];
--
GitLab