diff options
author | ArthurHoaro <arthur@hoa.ro> | 2016-05-29 12:32:14 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2016-06-11 09:30:56 +0200 |
commit | b74b96bfbd0b778ac50fd17f5e107c51435b1678 (patch) | |
tree | fd2debc510c2c51e9b75e2081a31a10e9c02ad06 /application/config/ConfigManager.php | |
parent | 684e662a58b02bde225e44d3677987b6fc3adf0b (diff) | |
download | Shaarli-b74b96bfbd0b778ac50fd17f5e107c51435b1678.tar.gz Shaarli-b74b96bfbd0b778ac50fd17f5e107c51435b1678.tar.zst Shaarli-b74b96bfbd0b778ac50fd17f5e107c51435b1678.zip |
Adds ConfigJson which handle the configuration in JSON format.
Also use the Updater to make the transition
Diffstat (limited to 'application/config/ConfigManager.php')
-rw-r--r-- | application/config/ConfigManager.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/application/config/ConfigManager.php b/application/config/ConfigManager.php index 212aac05..70456737 100644 --- a/application/config/ConfigManager.php +++ b/application/config/ConfigManager.php | |||
@@ -3,7 +3,7 @@ | |||
3 | // FIXME! Namespaces... | 3 | // FIXME! Namespaces... |
4 | require_once 'ConfigIO.php'; | 4 | require_once 'ConfigIO.php'; |
5 | require_once 'ConfigPhp.php'; | 5 | require_once 'ConfigPhp.php'; |
6 | #require_once 'ConfigJson.php'; | 6 | require_once 'ConfigJson.php'; |
7 | 7 | ||
8 | /** | 8 | /** |
9 | * Class ConfigManager | 9 | * Class ConfigManager |
@@ -84,12 +84,11 @@ class ConfigManager | |||
84 | */ | 84 | */ |
85 | protected function initialize() | 85 | protected function initialize() |
86 | { | 86 | { |
87 | /*if (! file_exists(self::$CONFIG_FILE .'.php')) { | 87 | if (! file_exists(self::$CONFIG_FILE .'.php')) { |
88 | $this->configIO = new ConfigJson(); | 88 | $this->configIO = new ConfigJson(); |
89 | } else { | 89 | } else { |
90 | $this->configIO = new ConfigPhp(); | 90 | $this->configIO = new ConfigPhp(); |
91 | }*/ | 91 | } |
92 | $this->configIO = new ConfigPhp(); | ||
93 | $this->load(); | 92 | $this->load(); |
94 | } | 93 | } |
95 | 94 | ||