projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
'make' nach Ă„nderungen in INSTALL.texi
[kivitendo-erp.git]
/
scripts
/
dbupgrade2_tool.pl
diff --git
a/scripts/dbupgrade2_tool.pl
b/scripts/dbupgrade2_tool.pl
index
fec77ab
..
97e8e3f
100755
(executable)
--- a/
scripts/dbupgrade2_tool.pl
+++ b/
scripts/dbupgrade2_tool.pl
@@
-17,13
+17,16
@@
use warnings;
use utf8;
use English '-no_match_vars';
use utf8;
use English '-no_match_vars';
+use Config::Std;
use DBI;
use Data::Dumper;
use Getopt::Long;
use Text::Iconv;
use SL::LXDebug;
use DBI;
use Data::Dumper;
use Getopt::Long;
use Text::Iconv;
use SL::LXDebug;
+use SL::LxOfficeConf;
+SL::LxOfficeConf->read;
our $lxdebug = LXDebug->new();
use SL::Auth;
our $lxdebug = LXDebug->new();
use SL::Auth;
@@
-358,11
+361,8
@@
sub build_upgrade_order {
#######
#######
#######
#######
-eval { require "config/lx-erp.conf"; };
-eval { require "config/lx-erp-local.conf"; } if (-f "config/lx-erp-local.conf");
-
-$locale = Locale->new($::language);
-$form = Form->new();
+$locale = Locale->new;
+$form = Form->new;
#######
#######
#######
#######