DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #11133 from inietov/fixes/backup_createdat_time_incorrect

Browse source 
Fixes #11096 Backup created_at time is incorrect
This commit is contained in:
snipe 2022-05-17 14:39:19 -07:00 committed by GitHub
parent 11f540daaf 72493d54aa
commit a8eb138ae0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1044,7 +1044,7 @@ class SettingsController extends Controller
*/ */
public function getBackups() public function getBackups()
{ {
$settings = Setting::getSettings();
$path = 'app/backups'; $path = 'app/backups';
$backup_files = Storage::files($path); $backup_files = Storage::files($path);
$files_raw = []; $files_raw = [];
@ -1061,7 +1061,7 @@ class SettingsController extends Controller
'filename' => basename($backup_files[$f]), 'filename' => basename($backup_files[$f]),
'filesize' => Setting::fileSizeConvert(Storage::size($backup_files[$f])), 'filesize' => Setting::fileSizeConvert(Storage::size($backup_files[$f])),
'modified_value' => $file_timestamp, 'modified_value' => $file_timestamp,
'modified_display' => Helper::getFormattedDateObject($file_timestamp, $type = 'datetime', false), 'modified_display' => date($settings->date_display_format.' '.$settings->time_display_format, $file_timestamp),
]; ];
} }