X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLxOfficeConf.pm;h=4e26c4e25335f1587c53be56d5b91ddaa087fab6;hb=a3335295fe8ac1acdb4b55324812c70af1e43b47;hp=89dbfde12ef9f38eec9fcc1aa5c61d909816aa74;hpb=1feda885f250f46e118a58ba774b7e5e485b5f6d;p=kivitendo-erp.git

diff --git a/SL/LxOfficeConf.pm b/SL/LxOfficeConf.pm
index 89dbfde12..4e26c4e25 100644
--- a/SL/LxOfficeConf.pm
+++ b/SL/LxOfficeConf.pm
@@ -30,10 +30,13 @@ sub read {
 
   return unless $class->safe_require($may_fail);
 
-  read_config('config/lx_office.conf.default' => \%::lx_office_conf);
+  # Backwards compatibility: read lx_office.conf.default if
+  # kivitendo.conf.default does't exist.
+  my $default_config = -f "config/kivitendo.conf.default" ? 'kivitendo' : 'lx_office';
+  read_config("config/${default_config}.conf.default" => \%::lx_office_conf);
   _decode_recursively(\%::lx_office_conf);
 
-  $file_name ||= 'config/lx_office.conf';
+  $file_name ||= -f 'config/kivitendo.conf' ? 'config/kivitendo.conf' : 'config/lx_office.conf';
 
   if (-f $file_name) {
     read_config($file_name => \ my %local_conf);