X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FForm.pm;h=9f0cf11bc3385cfbeaac74b3070906fa6b111883;hb=a607a2d0854ef2b2e85bff4ab9657166236129c0;hp=ed31ddf68ecc52bd21b902c5c74d35c4a619a298;hpb=3e466ad1ea3380b6dca3e8cd33827a2ef8039a75;p=kivitendo-erp.git

diff --git a/SL/Form.pm b/SL/Form.pm
index ed31ddf68..9f0cf11bc 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -40,6 +40,7 @@ package Form;
 use Carp;
 use Data::Dumper;
 
+use Carp;
 use CGI;
 use Cwd;
 use Encode;
@@ -307,8 +308,7 @@ sub error {
     $self->show_generic_error($msg);
 
   } else {
-    print STDERR "Error: $msg\n";
-    ::end_of_request();
+    confess "Error: $msg\n";
   }
 
   $main::lxdebug->leave_sub();
@@ -594,8 +594,11 @@ sub _prepare_html_template {
   if (-f "templates/webpages/${file}.html") {
     $file = "templates/webpages/${file}.html";
 
+  } elsif (ref $file eq 'SCALAR') {
+    # file is a scalarref, use inline mode
   } else {
     my $info = "Web page template '${file}' not found.\n";
+    $::form->header;
     print qq|<pre>$info</pre>|;
     ::end_of_request();
   }