From: Jan Büren <jan@lx-office-hosting.de>
Date: Fri, 6 May 2011 15:09:03 +0000 (+0200)
Subject: Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
X-Git-Tag: release-2.6.3~28
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/66ddc388f22a78ff14f7705a0d3d601e81440e04?hp=-c

Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
---

66ddc388f22a78ff14f7705a0d3d601e81440e04
diff --combined SL/Form.pm
index ae51efd78,b3a3e23df..8a4ecbf8d
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@@ -62,6 -62,7 +62,7 @@@ use SL::Menu
  use SL::OE;
  use SL::Template;
  use SL::User;
+ use SL::X;
  use Template;
  use URI;
  use List::Util qw(first max min sum);
@@@ -458,7 -459,7 +459,7 @@@ sub hide_form 
  
  sub throw_on_error {
    my ($self, $code) = @_;
-   local $self->{__ERROR_HANDLER} = sub { die({ error => $_[0] }) };
+   local $self->{__ERROR_HANDLER} = sub { die SL::X::FormError->new($_[0]) };
    $code->();
  }
  
@@@ -1203,6 -1204,7 +1204,6 @@@ sub parse_template 
    local (*IN, *OUT);
  
    my $userspath = $::lx_office_conf{paths}->{userspath};
 -
    $self->{"cwd"} = getcwd();
    $self->{"tmpdir"} = $self->{cwd} . "/${userspath}";
  
@@@ -1294,7 -1296,6 +1295,7 @@@
      $result = $template->parse(*STDOUT);
    }
  
 +  Common::copy_file_to_webdav_folder($self)  if ($self->{webdav});
    if (!$result) {
      $self->cleanup();
      $self->error("$self->{IN} : " . $template->get_error());