Merge branch 'master' of github.com:kivitendo/kivitendo-erp

[kivitendo-erp.git] / SL / DBConnect.pm

diff --git a/SL/DBConnect.pm b/SL/DBConnect.pm
index afdf2c9..9142f1c 100644 (file)
--- a/SL/DBConnect.pm
+++ b/SL/DBConnect.pm
@@ -44,7 +44,7 @@ sub connect {
 
 sub get_datestyle {
   my ($self, $dateformat) = @_;
-  return $dateformat_to_datestyle{ $dateformat || $::myconfig{dateformat} };
+  return $dateformat_to_datestyle{ $dateformat || $::myconfig{dateformat} // '' };
 }
 
 sub get_initial_sql {
@@ -72,7 +72,7 @@ sub get_connect_args {
 sub get_options {
   my $self    = shift;
   my $options = {
-    pg_enable_utf8 => $::locale->is_utf8,
+    pg_enable_utf8 => 1,
     @_
   };