X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDispatcher.pm;h=fe992ed2aef58c2e9b20b96a4ef3e193d7b3dc13;hb=19064edf6bd7859e831fdf37cd465f7f933be6f3;hp=f4c21d065641d12a179265475d294123c1cce1ad;hpb=a85404a430588940764a01c71779fe8fdfe42db0;p=kivitendo-erp.git

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index f4c21d065..fe992ed2a 100644
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -267,11 +267,6 @@ sub handle_request {
     delete @{ $::form }{ grep { m/^\{AUTH\}/ } keys %{ $::form } } unless $auth_result{keep_auth_vars};
 
     if ($action) {
-      $::instance_conf->init if $auth_result{auth_level} eq 'user';
-
-      map { $::form->{$_} = $::myconfig{$_} } qw(charset)
-        unless $action eq 'save' && $::form->{type} eq 'preferences';
-
       $::form->set_standard_title;
       if ($routing_type eq 'old') {
         ::call_sub('::' . $::locale->findsub($action));
@@ -355,7 +350,7 @@ sub _route_dispatcher_request {
   my ($script_name, $action);
 
   eval {
-    die "Unroutable request -- inavlid module name.\n" if !$::form->{M} || ($::form->{M} !~ m/^${name_re}$/);
+    die "Unroutable request -- invalid module name.\n" if !$::form->{M} || ($::form->{M} !~ m/^${name_re}$/);
     $script_name = $::form->{M} . '.pl';
 
     if ($::form->{A}) {
@@ -363,7 +358,7 @@ sub _route_dispatcher_request {
 
     } else {
       $action = first { m/^A_${name_re}$/ } keys %{ $::form };
-      die "Unroutable request -- inavlid action name.\n" if !$action;
+      die "Unroutable request -- invalid action name.\n" if !$action;
 
       delete $::form->{$action};
       $action = substr $action, 2;
@@ -384,7 +379,7 @@ sub _route_controller_request {
   my ($controller, $action, $request_type);
 
   eval {
-    $::form->{action}      =~ m|^ ( [A-Z] [A-Za-z0-9_]* ) / ( [a-z] [a-z0-9_]* ) ( \. [a-zA-Z]+ )? $|x || die "Unroutable request -- inavlid controller/action.\n";
+    $::form->{action}      =~ m|^ ( [A-Z] [A-Za-z0-9_]* ) / ( [a-z] [a-z0-9_]* ) ( \. [a-zA-Z]+ )? $|x || die "Unroutable request -- invalid controller/action.\n";
     ($controller, $action) =  ($1, $2);
     delete $::form->{action};