Fix various 15.0 bugs

Issue #821,#820,#819

Signed-off-by: Sean Molenaar <sean@seanmolenaar.eu>

1 files changed, 5 insertions, 8 deletions

diff --git a/lib/Config/LegacyConfig.php b/lib/Config/LegacyConfig.php
index 370638843..f011a0e4a 100644
--- a/lib/Config/LegacyConfig.php
+++ b/lib/Config/LegacyConfig.php
@@ -22,7 +22,9 @@ use Psr\Log\LoggerInterface;
 class LegacyConfig
 {
 
+    private $logger;
     private $fileSystem;
+
     public $autoPurgeMinimumInterval;  // seconds, used to define how
                                         // long deleted folders and feeds
                                         // should still be kept for an
@@ -31,8 +33,6 @@ class LegacyConfig
     public $maxRedirects;  // seconds
     public $feedFetcherTimeout;  // seconds
     public $useCronUpdates;  // turn off updates run by the cron
-    public $logger;
-    public $loggerParams;
     public $maxSize;
     public $exploreUrl;
     public $updateInterval;
@@ -42,15 +42,15 @@ class LegacyConfig
         LoggerInterface $logger
     ) {
         $this->fileSystem = $fileSystem;
+        $this->logger = $logger;
+        
         $this->autoPurgeMinimumInterval = 60;
         $this->autoPurgeCount = 200;
         $this->maxRedirects = 10;
         $this->maxSize = 100 * 1024 * 1024; // 100Mb
         $this->feedFetcherTimeout = 60;
         $this->useCronUpdates = true;
-        $this->logger = $logger;
         $this->exploreUrl = '';
-        $this->loggerParams = ['app' => Application::NAME];
         $this->updateInterval = 3600;
     }
 
@@ -63,10 +63,7 @@ class LegacyConfig
         $configValues = parse_ini_string($content);
 
         if ($configValues === false || count($configValues) === 0) {
-            $this->logger->warning(
-                'Configuration invalid. Ignoring values.',
-                $this->loggerParams
-            );
+            $this->logger->warning('Configuration invalid. Ignoring values.');
         } else {
             foreach ($configValues as $key => $value) {
                 if (property_exists($this, $key)) {