change config file location to root
This commit is contained in:
@@ -59,14 +59,14 @@ class Configuration {
|
|||||||
// by default, set the session save path to the default value;
|
// by default, set the session save path to the default value;
|
||||||
$this->values['session']['save_path'] = session_save_path();
|
$this->values['session']['save_path'] = session_save_path();
|
||||||
|
|
||||||
if(!file_exists($this->custom_config)) {
|
if(!file_exists($this->custom_config_filename)) {
|
||||||
throw new \RuntimeException('No configuration.local.php file was found. Create it with the proper config.');
|
throw new \RuntimeException('No configuration.local.php file was found. Create it with the proper config.');
|
||||||
}
|
}
|
||||||
|
|
||||||
$configuration = include_once $this->custom_config;
|
$configuration = include_once realpath(dirname(__FILE__) . '/../') . $this->custom_config_filename;
|
||||||
|
|
||||||
if(!is_array($configuration)) {
|
if(!is_array($configuration)) {
|
||||||
throw new \RuntimeException("You custom configuration in '{$this->custom_config}' must be in a variable named '\$configuration' and be an array.");
|
throw new \RuntimeException("You custom configuration in '{$this->custom_config_filename}' must be in a variable named '\$configuration' and be an array.");
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->values = array_replace_recursive($this->values, $configuration);
|
$this->values = array_replace_recursive($this->values, $configuration);
|
||||||
|
|||||||
Reference in New Issue
Block a user