From 91c7a89f93193bda284bee03ebea0df4a47f20dd Mon Sep 17 00:00:00 2001 From: Ivan Nieto Vivanco Date: Tue, 17 May 2022 16:24:52 -0500 Subject: [PATCH 1/2] Change to use the date() function instead of Helper::getFormattedDateObject() --- app/Http/Controllers/SettingsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 35a17b9ace..d2e56fa7eb 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -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("M d, Y g:i A", $file_timestamp), ]; } From 72493d54aa0186d11a876411c5c8378d26c655e5 Mon Sep 17 00:00:00 2001 From: Ivan Nieto Vivanco Date: Tue, 17 May 2022 16:36:05 -0500 Subject: [PATCH 2/2] Show the date and time as the user select in their settings --- app/Http/Controllers/SettingsController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index d2e56fa7eb..e71d2e4d18 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -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' => date("M d, Y g:i A", $file_timestamp), + 'modified_display' => date($settings->date_display_format.' '.$settings->time_display_format, $file_timestamp), ]; }