Merge pull request #969 from mikebronner/feature/fix-loading-of-config

Fix Loading of Config

Author: streamtw

src/Controllers/LfmController.php

@@ -83,7 +83,8 @@ public function error($error_type, $variables = [])
      */
     public function applyIniOverrides()
     {
-        $overrides = config('lfm.php_ini_overrides');
+        $overrides = config('lfm.php_ini_overrides', []);
+        
         if ($overrides && is_array($overrides) && count($overrides) === 0) {
             return;
         }

src/LaravelFilemanagerServiceProvider.php

@@ -51,6 +51,8 @@ public function boot()
      */
     public function register()
     {
+        $this->mergeConfigFrom(__DIR__ . '/config/lfm.php', 'lfm-config');
+
         $this->app->singleton('laravel-filemanager', function () {
             return true;
         });