projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
[kivitendo-erp.git]
/
SL
/
Auth.pm
diff --git
a/SL/Auth.pm
b/SL/Auth.pm
index
2bd2d09
..
f2d15a8
100644
(file)
--- a/
SL/Auth.pm
+++ b/
SL/Auth.pm
@@
-13,6
+13,7
@@
use SL::Auth::DB;
use SL::Auth::LDAP;
use SL::User;
use SL::Auth::LDAP;
use SL::User;
+use SL::DBUpgrade2;
use SL::DBUtils;
use strict;
use SL::DBUtils;
use strict;
@@
-256,7
+257,7
@@
sub create_database {
$main::lxdebug->message(LXDebug->DEBUG1(), "Auth::create_database DSN: $dsn");
$main::lxdebug->message(LXDebug->DEBUG1(), "Auth::create_database DSN: $dsn");
- my $charset = $
main::dbcharset
;
+ my $charset = $
::lx_office_conf{system}->{dbcharset}
;
$charset ||= Common::DEFAULT_CHARSET;
my $encoding = $Common::charset_to_db_encoding{$charset};
$encoding ||= 'UNICODE';
$charset ||= Common::DEFAULT_CHARSET;
my $encoding = $Common::charset_to_db_encoding{$charset};
$encoding ||= 'UNICODE';
@@
-299,11
+300,11
@@
sub create_tables {
my $self = shift;
my $dbh = $self->dbconnect();
my $self = shift;
my $dbh = $self->dbconnect();
- my $charset = $
main::dbcharset
;
+ my $charset = $
::lx_office_conf{system}->{dbcharset}
;
$charset ||= Common::DEFAULT_CHARSET;
$dbh->rollback();
$charset ||= Common::DEFAULT_CHARSET;
$dbh->rollback();
-
User->process_query($main::form,
$dbh, 'sql/auth_db.sql', undef, $charset);
+
SL::DBUpgrade2->new(form => $::form)->process_query(
$dbh, 'sql/auth_db.sql', undef, $charset);
$main::lxdebug->leave_sub();
}
$main::lxdebug->leave_sub();
}