Revision be6f6cfd
Von Moritz Bunkus vor fast 14 Jahren hinzugefügt
| SL/User.pm | ||
|---|---|---|
| 581 | 581 |
closedir(SQLDIR); |
| 582 | 582 |
} |
| 583 | 583 |
|
| 584 |
my $db_charset = $main::dbcharset;
|
|
| 584 |
my $db_charset = $::lx_office_conf{system}->{dbcharset};
|
|
| 585 | 585 |
$db_charset ||= Common::DEFAULT_CHARSET; |
| 586 | 586 |
|
| 587 | 587 |
my $dbupdater = SL::DBUpgrade2->new(form => $form, dbdriver => $form->{dbdriver});
|
| ... | ... | |
| 648 | 648 |
$form->{sid} = $form->{dbdefault};
|
| 649 | 649 |
|
| 650 | 650 |
my $rc = -2; |
| 651 |
my $db_charset = $main::dbcharset || Common::DEFAULT_CHARSET;
|
|
| 651 |
my $db_charset = $::lx_office_conf{system}->{dbcharset} || Common::DEFAULT_CHARSET;
|
|
| 652 | 652 |
|
| 653 | 653 |
map { $_->{description} = SL::Iconv::convert($_->{charset}, $db_charset, $_->{description}) } values %{ $dbupdater->{all_controls} };
|
| 654 | 654 |
|
Auch abrufbar als: Unified diff
Globale Variablen für Systemeinstellungen und Features nach %::lx_office_conf verschoben
Betroffen sind:
$webdav
$vertreter
$lizenzen
$show_best_before
$parts_show_image
$parts_image_css
$parts_listing_images
$eur
$dbcharset
$language