get_standard_dbh entfernt und auf SL::DB->client->dbh umgebogen

[mfinanz.git] / SL / User.pm

diff --git a/SL/User.pm b/SL/User.pm
index 742cb3a2aacabc166174c1e11675320a9ede3b96..6d671c4bdfeb80a834c07f40401fb3fd6c9715e8 100644 (file)
--- 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|);
@@ -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});