Fix #442 v1.8.2 lfm.url_prefix backward compatibility

UniSharp · Oct 17, 2017 · d214e13 · d214e13
1 parent a6273a8
commit d214e13
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/controllers/RedirectController.php b/src/controllers/RedirectController.php
@@ -15,7 +15,7 @@ class RedirectController extends LfmController
 
     public function __construct()
     {
-        $delimiter = config('lfm.url_prefix') . '/';
+        $delimiter = config('lfm.url_prefix', config('lfm.prefix')). '/';
         $url = urldecode(request()->url());
         $external_path = substr($url, strpos($url, $delimiter) + strlen($delimiter));
 

diff --git a/src/routes.php b/src/routes.php
@@ -4,7 +4,7 @@
     '\Unisharp\Laravelfilemanager\middlewares\MultiUser',
     '\Unisharp\Laravelfilemanager\middlewares\CreateDefaultFolder',
 ]);
-$prefix = \Config::get('lfm.url_prefix', 'laravel-filemanager');
+$prefix = \Config::get('lfm.url_prefix', \Config::get('lfm.prefix', 'laravel-filemanager'));
 $as = 'unisharp.lfm.';
 $namespace = '\Unisharp\Laravelfilemanager\controllers';
 

diff --git a/src/traits/LfmHelpers.php b/src/traits/LfmHelpers.php
@@ -110,7 +110,7 @@ public function getPathPrefix($type)
         }
 
         if ($type === 'url' && $base_directory !== 'public') {
-            $prefix = config('lfm.url_prefix', 'laravel-filemanager') . '/' . $prefix;
+            $prefix = config('lfm.url_prefix', config('lfm.prefix', 'laravel-filemanager')) . '/' . $prefix;
         }
 
         return $prefix;

diff --git a/src/views/demo.blade.php b/src/views/demo.blade.php
@@ -59,7 +59,7 @@
   <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
   <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
   <script>
-   var route_prefix = "{{ url(config('lfm.url_prefix')) }}";
+   var route_prefix = "{{ url(config('lfm.url_prefix', config('lfm.prefix'))) }}";
   </script>
 
   <!-- CKEditor init -->

diff --git a/src/views/index.blade.php b/src/views/index.blade.php
@@ -154,7 +154,7 @@
   <script src="{{ asset('vendor/laravel-filemanager/js/dropzone.min.js') }}"></script>
   <script>
     var route_prefix = "{{ url('/') }}";
-    var lfm_route = "{{ url(config('lfm.url_prefix')) }}";
+    var lfm_route = "{{ url(config('lfm.url_prefix', config('lfm.prefix'))) }}";
     var lang = {!! json_encode(trans('laravel-filemanager::lfm')) !!};
   </script>
   <script>{!! \File::get(base_path('vendor/unisharp/laravel-filemanager/public/js/script.js')) !!}</script>