bugfix: logger configuration doesn't take effect in PHP connector #123

psolom · Mar 15, 2017 · 82c6f60 · 82c6f60
1 parent 351a747
commit 82c6f60
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/connectors/php/application/FmApplication.php b/connectors/php/application/FmApplication.php
@@ -23,6 +23,10 @@ public function getInstance($custom_config = array())
         $base_config = require_once(FM_ROOT_PATH . '/config.php');
         $configuration = FmHelper::mergeConfigs($base_config, $custom_config);
 
+        if (isset($configuration['logger']) && $configuration['logger']['enabled'] == true ) {
+            $this->logger->enabled = true;
+        }
+
         if (isset($configuration['plugin']) && !empty($configuration['plugin'])) {
             $plugin_name = $configuration['plugin'];
             $plugin_path = FM_ROOT_PATH . "/plugins/{$plugin_name}/";
@@ -36,10 +40,6 @@ public function getInstance($custom_config = array())
             $fm = new LocalFilemanager($configuration);
         }
 
-        if (isset($configuration['logger']) && $configuration['logger']['enabled'] == true ) {
-            $this->logger->enabled = true;
-        }
-
         if(!auth()) {
             $fm->error($fm->lang('AUTHORIZATION_REQUIRED'));
         }

diff --git a/connectors/php/application/Logger.php b/connectors/php/application/Logger.php
@@ -12,7 +12,7 @@ class Logger {
     /**
      * @var boolean
      */
-    public $enabled = true;
+    public $enabled = false;
 
 
     public function __construct()

diff --git a/connectors/php/config.php b/connectors/php/config.php
@@ -31,7 +31,7 @@
      * Configure Logger class
      */
     "logger" => [
-        "enabled" => true,
+        "enabled" => false,
     ],
     /**
      * General options section