Merge pull request #11133 from inietov/fixes/backup_createdat_time_incorrect

Fixes #11096 Backup created_at time is incorrect
2022-05-17 14:39:19 -07:00
parent 11f540daaf 72493d54aa
commit a8eb138ae0
1 changed files with 2 additions and 2 deletions
@@ -1044,7 +1044,7 @@ class SettingsController extends Controller
     */
    public function getBackups()
    {
-
+        $settings = Setting::getSettings();
        $path = 'app/backups';
        $backup_files = Storage::files($path);
        $files_raw = [];
@@ -1061,7 +1061,7 @@ class SettingsController extends Controller
                        'filename' => basename($backup_files[$f]),
                        'filesize' => Setting::fileSizeConvert(Storage::size($backup_files[$f])),
                        '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),
                        
                    ];
                }