From ed7bfc4a981d759e51e19a5fe639983554fc8fc9 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Wed, 19 Jan 2011 12:40:09 +0100 Subject: [PATCH] =?utf8?q?Globales=20Konfigurationsobjekt=20%::lx=5Foffice?= =?utf8?q?=5Fconf=20m=C3=B6glichst=20fr=C3=BCh=20anlegen?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- SL/Dispatcher.pm | 6 +++--- scripts/console | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm index 687c37306..e92af8b02 100644 --- a/SL/Dispatcher.pm +++ b/SL/Dispatcher.pm @@ -75,6 +75,9 @@ sub pre_startup_setup { require "config/lx-erp-local.conf"; } if -f "config/lx-erp-local.conf"; + read_config 'config/lx_office.conf' => %::lx_office_conf; + _decode_recursively(\%::lx_office_conf); + eval { package main; require "bin/mozilla/common.pl"; @@ -94,9 +97,6 @@ sub pre_startup_setup { $::form = undef; %::myconfig = (); %::called_subs = (); # currently used for recursion detection - - read_config 'config/lx_office.conf' => %::lx_office_conf if -f "config/lx_office.conf"; - _decode_recursively(\%::lx_office_conf); } $SIG{__WARN__} = sub { diff --git a/scripts/console b/scripts/console index added9f83..4d89fdb57 100755 --- a/scripts/console +++ b/scripts/console @@ -68,15 +68,15 @@ sub lxinit { eval { require "config/lx-erp.conf"; }; eval { require "config/lx-erp-local.conf"; } if -f "config/lx-erp-local.conf"; + read_config 'config/lx_office.conf' => %::lx_office_conf; + SL::Dispatcher::_decode_recursively(\%::lx_office_conf); + $::lxdebug = LXDebug->new; $::locale = Locale->new($::language); $::cgi = CGI->new qw(); $::form = Form->new; $::auth = SL::Auth->new; - read_config 'config/lx_office.conf' => %::lx_office_conf; - SL::Dispatcher::_decode_recursively(\%::lx_office_conf); - die 'cannot reach auth db' unless $::auth->session_tables_present; $::auth->restore_session; -- 2.20.1