X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FForm.pm;h=d85fe54daf8329ec606f67241e5f566e26d59563;hb=91ee6cb28c37fe07d001da04808f9c49e1959502;hp=25c4ab09bc753ace464f2c50d6818f28fa34eb3f;hpb=ad9563c88825c4810a1efa6f6290e6f1df17a282;p=kivitendo-erp.git

diff --git a/SL/Form.pm b/SL/Form.pm
index 25c4ab09b..d85fe54da 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -566,12 +566,17 @@ sub create_http_response {
 
   my $session_cookie;
   if (defined $main::auth) {
+    my $uri      = $self->_get_request_uri;
+    my @segments = $uri->path_segments;
+    pop @segments;
+    $uri->path_segments(@segments);
+
     my $session_cookie_value   = $main::auth->get_session_id();
     $session_cookie_value    ||= 'NO_SESSION';
 
     $session_cookie = $cgi->cookie('-name'   => $main::auth->get_session_cookie_name(),
                                    '-value'  => $session_cookie_value,
-                                   '-path'   => $self->_get_request_uri->path,
+                                   '-path'   => $uri->path,
                                    '-secure' => $ENV{HTTPS});
   }
 
@@ -788,6 +793,7 @@ sub _prepare_html_template {
     $jsc_dateformat =~ s/m+/\%m/gi;
     $jsc_dateformat =~ s/y+/\%Y/gi;
     $additional_params->{"myconfig_jsc_dateformat"} = $jsc_dateformat;
+    $additional_params->{"myconfig"} ||= \%::myconfig;
   }
 
   $additional_params->{"conf_dbcharset"}              = $main::dbcharset;