X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLxOfficeConf.pm;h=7690eebdabc9af004b4c2d0572af7a2bf022da7c;hb=af56ae02cd83ad4fff35a3ef695a9fcf4c074caf;hp=8f44016e6b43175493b2e32c0e7c12b000ed4e6e;hpb=c599fef2ec41c86b711406c9968772ef70b6cb3f;p=kivitendo-erp.git

diff --git a/SL/LxOfficeConf.pm b/SL/LxOfficeConf.pm
index 8f44016e6..7690eebda 100644
--- a/SL/LxOfficeConf.pm
+++ b/SL/LxOfficeConf.pm
@@ -6,11 +6,15 @@ use Config::Std;
 use Encode;
 
 sub read {
+  my ($class, $file_name) = @_;
+
   read_config 'config/lx_office.conf.default' => %::lx_office_conf;
   _decode_recursively(\%::lx_office_conf);
 
-  if (-f 'config/lx_office.conf') {
-    read_config 'config/lx_office.conf' => my %local_conf;
+  $file_name ||= 'config/lx_office.conf';
+
+  if (-f $file_name) {
+    read_config $file_name => my %local_conf;
     _decode_recursively(\%local_conf);
     _flat_merge(\%::lx_office_conf, \%local_conf);
   }