projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pagebreak-Mechanismus entfernen
[kivitendo-erp.git]
/
SL
/
Dispatcher.pm
diff --git
a/SL/Dispatcher.pm
b/SL/Dispatcher.pm
index
97a2f45
..
e9f7dac
100644
(file)
--- a/
SL/Dispatcher.pm
+++ b/
SL/Dispatcher.pm
@@
-95,7
+95,7
@@
sub pre_startup_setup {
$::auth = SL::Auth->new;
$::form = undef;
%::myconfig = ();
$::auth = SL::Auth->new;
$::form = undef;
%::myconfig = ();
- %::called_subs = (); # currently used for recursion detection
+ $::request = undef;
}
$SIG{__WARN__} = sub {
}
$SIG{__WARN__} = sub {
@@
-168,11
+168,10
@@
sub handle_request {
$self->unrequire_bin_mozilla;
$self->unrequire_bin_mozilla;
- $::cgi = CGI->new('');
$::locale = Locale->new($::lx_office_conf{system}->{language});
$::form = Form->new;
$::locale = Locale->new($::lx_office_conf{system}->{language});
$::form = Form->new;
- %::called_subs = ();
$::instance_conf = SL::InstanceConfiguration->new;
$::instance_conf = SL::InstanceConfiguration->new;
+ $::request = { cgi => CGI->new({}) };
my $session_result = $::auth->restore_session;
$::auth->create_or_refresh_session;
my $session_result = $::auth->restore_session;
$::auth->create_or_refresh_session;
@@
-240,7
+239,7
@@
sub handle_request {
} or do {
if ($EVAL_ERROR ne END_OF_REQUEST) {
print STDERR $EVAL_ERROR;
} or do {
if ($EVAL_ERROR ne END_OF_REQUEST) {
print STDERR $EVAL_ERROR;
- $::form->{label_error} = $::
cgi
->pre($EVAL_ERROR);
+ $::form->{label_error} = $::
request->{cgi}
->pre($EVAL_ERROR);
eval { show_error('generic/error') };
}
};
eval { show_error('generic/error') };
}
};
@@
-253,6
+252,7
@@
sub handle_request {
$::locale = undef;
$::form = undef;
$::myconfig = ();
$::locale = undef;
$::form = undef;
$::myconfig = ();
+ $::request = undef;
Form::disconnect_standard_dbh;
$::lxdebug->end_request;
Form::disconnect_standard_dbh;
$::lxdebug->end_request;
@@
-310,7
+310,7
@@
sub _route_dispatcher_request {
1;
} or do {
1;
} or do {
- $::form->{label_error} = $::
cgi
->pre($EVAL_ERROR);
+ $::form->{label_error} = $::
request->{cgi}
->pre($EVAL_ERROR);
show_error('generic/error');
};
show_error('generic/error');
};
@@
-327,7
+327,7
@@
sub _route_controller_request {
1;
} or do {
1;
} or do {
- $::form->{label_error} = $::
cgi
->pre($EVAL_ERROR);
+ $::form->{label_error} = $::
request->{cgi}
->pre($EVAL_ERROR);
show_error('generic/error');
};
show_error('generic/error');
};