Skip to content
Snippets Groups Projects
Commit 5b547fa5 authored by Stein Magne Bjorklund's avatar Stein Magne Bjorklund
Browse files

Inverted dependencies in application default settings

Application default settings cannot have dependencies
on the local user provided settings.
parent 3c1dd3fe
No related branches found
No related tags found
1 merge request!16Resolve "Introduce PSR-4 autoloading"
...@@ -79,6 +79,8 @@ $conf['modules']['available'] = array('static','service', 'type'); ...@@ -79,6 +79,8 @@ $conf['modules']['available'] = array('static','service', 'type');
//$conf['modules']['available'] = array('session', 'static','uri', 'type', 'service'); //$conf['modules']['available'] = array('session', 'static','uri', 'type', 'service');
$conf['admin']['pass'] = 'admin'; $conf['admin']['pass'] = 'admin';
$conf['view']['standard']['baseUrl'] = '';
$conf['basedir'] = '';
global $lodspk; global $lodspk;
$lodspk['maxResults'] = 1000; $lodspk['maxResults'] = 1000;
...@@ -86,5 +88,3 @@ $lodspk['maxResults'] = 1000; ...@@ -86,5 +88,3 @@ $lodspk['maxResults'] = 1000;
if (file_exists(LOADSPEAKR_ROOT . '/settings.inc.php')) { if (file_exists(LOADSPEAKR_ROOT . '/settings.inc.php')) {
require_once LOADSPEAKR_ROOT . '/settings.inc.php'; require_once LOADSPEAKR_ROOT . '/settings.inc.php';
} }
$conf['view']['standard']['baseUrl'] = $conf['basedir'];
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment