aboutsummaryrefslogtreecommitdiffhomepage
path: root/application/config/ConfigManager.php
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2017-03-21 20:04:09 +0100
committerGitHub <noreply@github.com>2017-03-21 20:04:09 +0100
commit4bad4bde5a2b8dcbb00e95662e30b4694fe97266 (patch)
tree0e2b43f854ff230b744d292959429e743aa3609d /application/config/ConfigManager.php
parent5c0e68c07148014191270d7c82b800f0bdb9196e (diff)
parentc6a4c2882d89c6bcceeeccd319549611a5d1801b (diff)
downloadShaarli-4bad4bde5a2b8dcbb00e95662e30b4694fe97266.tar.gz
Shaarli-4bad4bde5a2b8dcbb00e95662e30b4694fe97266.tar.zst
Shaarli-4bad4bde5a2b8dcbb00e95662e30b4694fe97266.zip
Merge pull request #817 from ArthurHoaro/feature/json-conf-parsing
Proper error if the conf file is invalid instead of fatal error
Diffstat (limited to 'application/config/ConfigManager.php')
-rw-r--r--application/config/ConfigManager.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/application/config/ConfigManager.php b/application/config/ConfigManager.php
index f2097410..e98af8ab 100644
--- a/application/config/ConfigManager.php
+++ b/application/config/ConfigManager.php
@@ -81,7 +81,11 @@ class ConfigManager
81 */ 81 */
82 protected function load() 82 protected function load()
83 { 83 {
84 $this->loadedConfig = $this->configIO->read($this->getConfigFileExt()); 84 try {
85 $this->loadedConfig = $this->configIO->read($this->getConfigFileExt());
86 } catch (\Exception $e) {
87 die($e->getMessage());
88 }
85 $this->setDefaultValues(); 89 $this->setDefaultValues();
86 } 90 }
87 91