From: Moritz Bunkus Date: Wed, 29 Jun 2011 08:45:56 +0000 (+0200) Subject: Kosmetik X-Git-Tag: release-2.7.0beta1~358 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=27e80751043612bbb6d75b36d8dcd6b6eb7d6b9e;p=kivitendo-erp.git Kosmetik --- diff --git a/SL/Controller/Base.pm b/SL/Controller/Base.pm index 392f441c2..f8eee88a6 100644 --- a/SL/Controller/Base.pm +++ b/SL/Controller/Base.pm @@ -65,15 +65,15 @@ sub render { } my %params = ( %locals, - AUTH => $::auth, - FLASH => $::form->{FLASH}, - FORM => $::form, + AUTH => $::auth, + FLASH => $::form->{FLASH}, + FORM => $::form, INSTANCE_CONF => $::instance_conf, - LOCALE => $::locale, - LXCONFIG => \%::lx_office_conf, - LXDEBUG => $::lxdebug, - MYCONFIG => \%::myconfig, - SELF => $self, + LOCALE => $::locale, + LXCONFIG => \%::lx_office_conf, + LXDEBUG => $::lxdebug, + MYCONFIG => \%::myconfig, + SELF => $self, ); my $output; diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm index 03f1c5776..4aadef74d 100644 --- a/SL/Dispatcher.pm +++ b/SL/Dispatcher.pm @@ -169,10 +169,10 @@ sub handle_request { $self->unrequire_bin_mozilla; - $::cgi = CGI->new(''); - $::locale = Locale->new($::lx_office_conf{system}->{language}); - $::form = Form->new; - %::called_subs = (); + $::cgi = CGI->new(''); + $::locale = Locale->new($::lx_office_conf{system}->{language}); + $::form = Form->new; + %::called_subs = (); $::instance_conf = SL::InstanceConfiguration->new; my $session_result = $::auth->restore_session; diff --git a/scripts/console b/scripts/console index b9b474585..d567c5640 100755 --- a/scripts/console +++ b/scripts/console @@ -60,11 +60,11 @@ sub lxinit { package main; - $::lxdebug = LXDebug->new(file => $debug_file); - $::locale = Locale->new($::lx_office_conf{system}->{language}); - $::cgi = CGI->new qw(); - $::form = Form->new; - $::auth = SL::Auth->new; + $::lxdebug = LXDebug->new(file => $debug_file); + $::locale = Locale->new($::lx_office_conf{system}->{language}); + $::cgi = CGI->new qw(); + $::form = Form->new; + $::auth = SL::Auth->new; $::instance_conf = SL::InstanceConfiguration->new; die 'cannot reach auth db' unless $::auth->session_tables_present;