DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-15 01:54:09 -08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2024-07-09 11:48:30 +01:00
parent 43d4bc8dc4 491a0f3959
commit 090410edb5
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/SettingsController.php
View file

@ -32,6 +32,7 @@ use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\URL; use Illuminate\Support\Facades\URL;
use Illuminate\Support\Facades\Validator; use Illuminate\Support\Facades\Validator;
use Symfony\Component\HttpFoundation\BinaryFileResponse;
/** /**
* This controller handles all actions related to Settings for * This controller handles all actions related to Settings for
@ -1116,7 +1117,7 @@ class SettingsController extends Controller
* @author [A. Gianotto] [<snipe@snipe.net>] * @author [A. Gianotto] [<snipe@snipe.net>]
* @since [v1.8] * @since [v1.8]
*/ */
public function downloadFile($filename = null) : RedirectResponse public function downloadFile($filename = null) : RedirectResponse | BinaryFileResponse
{ {
$path = 'app/backups'; $path = 'app/backups';