From 180163aaf13906eedc96390ff6c6209bdfa8623d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sven=20Sch=C3=B6ling?= <s.schoeling@linet-services.de>
Date: Tue, 16 Aug 2016 13:21:10 +0200
Subject: [PATCH] =?utf8?q?DBUpgrade:=20tempor=C3=A4re=20dbh=20Behandlung?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 SL/DBUpgrade2.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/SL/DBUpgrade2.pm b/SL/DBUpgrade2.pm
index 753783c99..ede850154 100644
--- a/SL/DBUpgrade2.pm
+++ b/SL/DBUpgrade2.pm
@@ -243,7 +243,8 @@ sub process_perl_script {
   $dbh->begin_work;
 
   # setup dbup_ export vars & run script
-  my $old_dbh       = SL::DB->client->dbh($dbh);
+  my $old_dbh       = SL::DB->client->dbh;
+  SL::DB->client->dbh($dbh);
   my %dbup_myconfig = map { ($_ => $::form->{$_}) } qw(dbname dbuser dbpasswd dbhost dbport dbconnect);
   my $result        = eval {
     SL::DBUpgrade2::Base::execute_script(
@@ -256,7 +257,7 @@ sub process_perl_script {
 
   my $error = $EVAL_ERROR;
 
-  $::form->set_standard_dbh($old_dbh);
+  SL::DB->client->dbh($old_dbh);
 
   $dbh->rollback if 1 != ($result // -1);
 
-- 
2.20.1