X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/9f8a3ead2d89585f1e19422e016e7bbc9fa1efe0..3a94f4d2dd9a835d4a7007e1b999ea00b3c4e1cd:/SL/DBUpgrade2.pm

diff --git a/SL/DBUpgrade2.pm b/SL/DBUpgrade2.pm
index 8e61f222f..af5037acc 100644
--- a/SL/DBUpgrade2.pm
+++ b/SL/DBUpgrade2.pm
@@ -4,6 +4,7 @@ use IO::File;
 use List::MoreUtils qw(any);
 
 use SL::Common;
+use SL::DBUtils;
 use SL::Iconv;
 
 use strict;
@@ -352,7 +353,7 @@ sub apply_admin_dbupgrade_scripts {
 
   return 0 if !@unapplied_scripts;
 
-  my $db_charset           = $main::dbcharset || Common::DEFAULT_CHARSET;
+  my $db_charset           = $::lx_office_conf{system}->{dbcharset} || Common::DEFAULT_CHARSET;
   $self->{form}->{login} ||= 'admin';
 
   map { $_->{description} = SL::Iconv::convert($_->{charset}, $db_charset, $_->{description}) } values %{ $self->{all_controls} };