Skip to content

Commit d214e13

Browse files
committed
Fix #442 v1.8.2 lfm.url_prefix backward compatibility
1 parent a6273a8 commit d214e13

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

src/controllers/RedirectController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class RedirectController extends LfmController
1515

1616
public function __construct()
1717
{
18-
$delimiter = config('lfm.url_prefix') . '/';
18+
$delimiter = config('lfm.url_prefix', config('lfm.prefix')). '/';
1919
$url = urldecode(request()->url());
2020
$external_path = substr($url, strpos($url, $delimiter) + strlen($delimiter));
2121

src/routes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
'\Unisharp\Laravelfilemanager\middlewares\MultiUser',
55
'\Unisharp\Laravelfilemanager\middlewares\CreateDefaultFolder',
66
]);
7-
$prefix = \Config::get('lfm.url_prefix', 'laravel-filemanager');
7+
$prefix = \Config::get('lfm.url_prefix', \Config::get('lfm.prefix', 'laravel-filemanager'));
88
$as = 'unisharp.lfm.';
99
$namespace = '\Unisharp\Laravelfilemanager\controllers';
1010

src/traits/LfmHelpers.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public function getPathPrefix($type)
110110
}
111111

112112
if ($type === 'url' && $base_directory !== 'public') {
113-
$prefix = config('lfm.url_prefix', 'laravel-filemanager') . '/' . $prefix;
113+
$prefix = config('lfm.url_prefix', config('lfm.prefix', 'laravel-filemanager')) . '/' . $prefix;
114114
}
115115

116116
return $prefix;

src/views/demo.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
6060
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
6161
<script>
62-
var route_prefix = "{{ url(config('lfm.url_prefix')) }}";
62+
var route_prefix = "{{ url(config('lfm.url_prefix', config('lfm.prefix'))) }}";
6363
</script>
6464

6565
<!-- CKEditor init -->

src/views/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
<script src="{{ asset('vendor/laravel-filemanager/js/dropzone.min.js') }}"></script>
155155
<script>
156156
var route_prefix = "{{ url('/') }}";
157-
var lfm_route = "{{ url(config('lfm.url_prefix')) }}";
157+
var lfm_route = "{{ url(config('lfm.url_prefix', config('lfm.prefix'))) }}";
158158
var lang = {!! json_encode(trans('laravel-filemanager::lfm')) !!};
159159
</script>
160160
<script>{!! \File::get(base_path('vendor/unisharp/laravel-filemanager/public/js/script.js')) !!}</script>

0 commit comments

Comments
 (0)