projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Konfigurationsort für viele Flags ist Abschnitt 'features', nicht 'system'
[kivitendo-erp.git]
/
SL
/
User.pm
diff --git
a/SL/User.pm
b/SL/User.pm
index
becfcb7
..
520bf42
100644
(file)
--- a/
SL/User.pm
+++ b/
SL/User.pm
@@
-581,7
+581,7
@@
sub dbupdate {
closedir(SQLDIR);
}
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});
$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;
$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} };
map { $_->{description} = SL::Iconv::convert($_->{charset}, $db_charset, $_->{description}) } values %{ $dbupdater->{all_controls} };