diff options
author | ArthurHoaro <arthur@hoa.ro> | 2016-06-09 20:04:02 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2016-06-11 09:30:56 +0200 |
commit | 278d9ee2836df7d805845077f26f8cecd16f0f4f (patch) | |
tree | 9155cab8890074e83b54efaa649bfa74885d3ab5 /application/ApplicationUtils.php | |
parent | 7f179985b497053c59338667fe49c390aa626ab7 (diff) | |
download | Shaarli-278d9ee2836df7d805845077f26f8cecd16f0f4f.tar.gz Shaarli-278d9ee2836df7d805845077f26f8cecd16f0f4f.tar.zst Shaarli-278d9ee2836df7d805845077f26f8cecd16f0f4f.zip |
ConfigManager no longer uses singleton pattern
Diffstat (limited to 'application/ApplicationUtils.php')
-rw-r--r-- | application/ApplicationUtils.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/application/ApplicationUtils.php b/application/ApplicationUtils.php index 37deb4b3..c5a157b9 100644 --- a/application/ApplicationUtils.php +++ b/application/ApplicationUtils.php | |||
@@ -132,12 +132,13 @@ class ApplicationUtils | |||
132 | /** | 132 | /** |
133 | * Checks Shaarli has the proper access permissions to its resources | 133 | * Checks Shaarli has the proper access permissions to its resources |
134 | * | 134 | * |
135 | * @param ConfigManager $conf Configuration Manager instance. | ||
136 | * | ||
135 | * @return array A list of the detected configuration issues | 137 | * @return array A list of the detected configuration issues |
136 | */ | 138 | */ |
137 | public static function checkResourcePermissions() | 139 | public static function checkResourcePermissions($conf) |
138 | { | 140 | { |
139 | $errors = array(); | 141 | $errors = array(); |
140 | $conf = ConfigManager::getInstance(); | ||
141 | 142 | ||
142 | // Check script and template directories are readable | 143 | // Check script and template directories are readable |
143 | foreach (array( | 144 | foreach (array( |
@@ -168,7 +169,7 @@ class ApplicationUtils | |||
168 | 169 | ||
169 | // Check configuration files are readable and writeable | 170 | // Check configuration files are readable and writeable |
170 | foreach (array( | 171 | foreach (array( |
171 | $conf->getConfigFile(), | 172 | $conf->getConfigFileExt(), |
172 | $conf->get('path.datastore'), | 173 | $conf->get('path.datastore'), |
173 | $conf->get('path.ban_file'), | 174 | $conf->get('path.ban_file'), |
174 | $conf->get('path.log'), | 175 | $conf->get('path.log'), |