From: Sven Schöling <s.schoeling@linet-services.de>
Date: Tue, 15 Sep 2015 15:27:39 +0000 (+0200)
Subject: DBConnect Caching: DBConnect auto args in den Key aufnehmen
X-Git-Tag: release-3.4.1~738
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=1853d2519cc6a003a6bb8feee4d70812cb956b23;hp=e81bb2713ab1979710887694fe950c8bccacda38;p=kivitendo-erp.git

DBConnect Caching: DBConnect auto args in den Key aufnehmen
---

diff --git a/SL/DBConnect.pm b/SL/DBConnect.pm
index 4ee48733f..9f2472c13 100644
--- a/SL/DBConnect.pm
+++ b/SL/DBConnect.pm
@@ -16,7 +16,6 @@ my %dateformat_to_datestyle = (
 
 sub _connect {
   my ($self, @args) = @_;
-  @args = $self->get_connect_args if !@args;
 
   return DBI->connect(@args) unless $::lx_office_conf{debug} && $::lx_office_conf{debug}->{dbix_log4perl};
 
@@ -33,6 +32,7 @@ sub _connect {
 
 sub connect {
   my ($self, @args) = @_;
+  @args = $self->get_connect_args if !@args;
   my $initial_sql = $self->get_initial_sql;
 
   if (my $cached_dbh = SL::DBConnect::Cache->get(@args, $initial_sql)) {