From 278d9ee2836df7d805845077f26f8cecd16f0f4f Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Thu, 9 Jun 2016 20:04:02 +0200
Subject: ConfigManager no longer uses singleton pattern

---
 application/ApplicationUtils.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'application/ApplicationUtils.php')

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
     /**
      * Checks Shaarli has the proper access permissions to its resources
      *
+     * @param ConfigManager $conf Configuration Manager instance.
+     *
      * @return array A list of the detected configuration issues
      */
-    public static function checkResourcePermissions()
+    public static function checkResourcePermissions($conf)
     {
         $errors = array();
-        $conf = ConfigManager::getInstance();
 
         // Check script and template directories are readable
         foreach (array(
@@ -168,7 +169,7 @@ class ApplicationUtils
 
         // Check configuration files are readable and writeable
         foreach (array(
-            $conf->getConfigFile(),
+            $conf->getConfigFileExt(),
             $conf->get('path.datastore'),
             $conf->get('path.ban_file'),
             $conf->get('path.log'),
-- 
cgit v1.2.3