[otrs-cvs] otrs/Kernel/System CustomerCompany.pm, 1.26.2.2, 1.26.2.3

Comments:
Update of /home/cvs/otrs/Kernel/System
In directory lancelot:/tmp/cvs-serv32425/Kernel/System

Modified Files:
      Tag: rel-3_1
	CustomerCompany.pm 
Log Message:
Moved Connect parts to CustomerCompany and CustomerUser Params configuration.

Author: jh

Index: CustomerCompany.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/System/CustomerCompany.pm,v
retrieving revision 1.26.2.2
retrieving revision 1.26.2.3
diff -2 -u -d -r1.26.2.2 -r1.26.2.3
--- CustomerCompany.pm	29 Nov 2012 12:57:25 -0000	1.26.2.2
+++ CustomerCompany.pm	3 Dec 2012 10:39:00 -0000	1.26.2.3
@@ -120,5 +120,5 @@
 
     # charset settings
-    my %DatabasePreferences;
+    my $DatabasePreferences = $Self->{ConfigObject}->Get('CustomerCompany')->{Params} || {};
     $Self->{SourceCharset}
         = $Self->{ConfigObject}->Get('CustomerCompany')->{Params}->{SourceCharset} || '';
@@ -128,6 +128,5 @@
         = $Self->{ConfigObject}->Get('CustomerCompany')->{Params}->{CharsetConvertForce} || '';
     if ( $Self->{SourceCharset} !~ /utf(-8|8)/i ) {
-        $DatabasePreferences{Encode}  = 0;
-        $DatabasePreferences{Connect} = '';
+        $DatabasePreferences->{Encode} = 0;
     }
 
@@ -143,5 +142,7 @@
             DatabasePw   => $Self->{ConfigObject}->Get('CustomerCompany')->{Params}->{Password},
             Type         => $Self->{ConfigObject}->Get('CustomerCompany')->{Params}->{Type} || '',
-            %DatabasePreferences,
+            %{$DatabasePreferences},
+
+            #            %{ $Self->{CustomerCompanyMap}->{Params} },
         ) || die('Can\'t connect to database!');
 
---------------------------------------------------------------------
OTRS mailing list: cvs-log - Webpage: http://otrs.org/
Archive: http://lists.otrs.org/pipermail/cvs-log
To unsubscribe: http://lists.otrs.org/cgi-bin/listinfo/cvs-log