X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FUser.pm;h=520bf422959e316d965ab4c70b0913fe506bca1e;hb=606e7e2575ff6112e8e45acf0e74e87faa5cfa7c;hp=becfcb7990d76fd0eb2f1e6f341c0ac7e5ddfe20;hpb=8cd05ad64866ce200f888a35723ae4b7e24a2012;p=kivitendo-erp.git

diff --git a/SL/User.pm b/SL/User.pm
index becfcb799..520bf4229 100644
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -581,7 +581,7 @@ sub dbupdate {
     closedir(SQLDIR);
   }
 
-  my $db_charset = $main::dbcharset;
+  my $db_charset = $::lx_office_conf{system}->{dbcharset};
   $db_charset ||= Common::DEFAULT_CHARSET;
 
   my $dbupdater = SL::DBUpgrade2->new(form => $form, dbdriver => $form->{dbdriver});
@@ -648,7 +648,7 @@ sub dbupdate2 {
   $form->{sid} = $form->{dbdefault};
 
   my $rc         = -2;
-  my $db_charset = $main::dbcharset || Common::DEFAULT_CHARSET;
+  my $db_charset = $::lx_office_conf{system}->{dbcharset} || Common::DEFAULT_CHARSET;
 
   map { $_->{description} = SL::Iconv::convert($_->{charset}, $db_charset, $_->{description}) } values %{ $dbupdater->{all_controls} };