X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FUser.pm;h=615f670388fb2a0b6ea58927d06b86befe7ce331;hb=28c19c1c99304a88bf3cd57eb02a4f3d502a6c62;hp=742cb3a2aacabc166174c1e11675320a9ede3b96;hpb=fbbfd3ce7bdc893ac30638cce1427938276b659b;p=kivitendo-erp.git

diff --git a/SL/User.pm b/SL/User.pm
index 742cb3a2a..615f67038 100644
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -37,6 +37,7 @@ package User;
 use IO::File;
 use Fcntl qw(:seek);
 
+use SL::DB;
 #use SL::Auth;
 use SL::DB::AuthClient;
 use SL::DB::Employee;
@@ -113,7 +114,7 @@ sub login {
   return LOGIN_AUTH_DBUPDATE_AVAILABLE() if $dbupdater_auth->unapplied_upgrade_scripts($::auth->dbconnect);
 
   # check if database is down
-  my $dbh = $form->dbconnect_noauto;
+  my $dbh = SL::DB->client->dbh;
 
   # we got a connection, check the version
   my ($dbversion) = $dbh->selectrow_array(qq|SELECT version FROM defaults|);
@@ -126,7 +127,7 @@ sub login {
 
   my $dbupdater        = SL::DBUpgrade2->new(form => $form)->parse_dbupdate_controls;
   my @unapplied_scripts = $dbupdater->unapplied_upgrade_scripts($dbh);
-  $dbh->disconnect;
+#   $dbh->disconnect;
 
   if (!@unapplied_scripts) {
     SL::DB::Manager::Employee->update_entries_for_authorized_users;
@@ -433,9 +434,6 @@ sub dbupdate2 {
 
   &dbconnect_vars($form, $db);
 
-  # Flush potentially held database locks.
-#   $form->get_standard_dbh->commit;
-
   my $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}, SL::DBConnect->get_options) or $form->dberror;
 
   $dbh->do($form->{dboptions}) if ($form->{dboptions});