From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 6 Jun 2013 13:03:58 +0000 (+0200)
Subject: SL::Form->dbconnect*: Connect-Settings nicht aus %::myconfig, sondern SL::DBConnect... 
X-Git-Tag: release-3.1.0beta1~331^2~57
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=bfe3243c4cdeacea07e53d6365bc384dfd0e6b4d;p=kivitendo-erp.git

SL::Form->dbconnect*: Connect-Settings nicht aus %::myconfig, sondern SL::DBConnect::connect überlassen
---

diff --git a/SL/Form.pm b/SL/Form.pm
index 07702fbfc..330799766 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -1373,8 +1373,7 @@ sub dbconnect {
   my ($self, $myconfig) = @_;
 
   # connect to database
-  my $dbh = SL::DBConnect->connect($myconfig->{dbconnect}, $myconfig->{dbuser}, $myconfig->{dbpasswd}, SL::DBConnect->get_options)
-    or $self->dberror;
+  my $dbh = SL::DBConnect->connect or $self->dberror;
 
   # set db options
   if ($myconfig->{dboptions}) {
@@ -1392,8 +1391,7 @@ sub dbconnect_noauto {
   my ($self, $myconfig) = @_;
 
   # connect to database
-  my $dbh = SL::DBConnect->connect($myconfig->{dbconnect}, $myconfig->{dbuser}, $myconfig->{dbpasswd}, SL::DBConnect->get_options(AutoCommit => 0))
-    or $self->dberror;
+  my $dbh = SL::DBConnect->connect(SL::DBConnect->get_connect_args(AutoCommit => 0)) or $self->dberror;
 
   # set db options
   if ($myconfig->{dboptions}) {