From 497d36691b29a0ef122c2d8ecca212b96a9c3943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Thu, 16 Mar 2023 10:42:55 +0300 Subject: [PATCH] Fixed set null setting localisation `date_separator` --- app/Traits/DateTime.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Traits/DateTime.php b/app/Traits/DateTime.php index df95d7651..903fec820 100644 --- a/app/Traits/DateTime.php +++ b/app/Traits/DateTime.php @@ -32,8 +32,10 @@ trait DateTime $chars = ['dash' => '-', 'slash' => '/', 'dot' => '.', 'comma' => ',', 'space' => ' ']; - $date_format = setting('localisation.date_format', $default); - $date_separator = $chars[setting('localisation.date_separator', 'space')]; + $date_format = (setting('localisation.date_format', $default)) ?? $default; + + $char = (setting('localisation.date_separator', 'space')) ?? 'space'; + $date_separator = $chars[$char]; return str_replace(' ', $date_separator, $date_format); }