X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FMailer.pm;h=37d98b7a7d00bf12d705eab256f8c144bcec5082;hb=9d047497dcea5258e2fab7eb2cbe8606a74f27e0;hp=453603ff1f234f0afb7555868a9e9ba025c1c43b;hpb=231412071142f1ca5a20d86fb5e090b795400996;p=kivitendo-erp.git

diff --git a/SL/Mailer.pm b/SL/Mailer.pm
index 453603ff1..37d98b7a7 100644
--- a/SL/Mailer.pm
+++ b/SL/Mailer.pm
@@ -147,6 +147,17 @@ $self->{message}
 
     foreach my $attachment (@{ $self->{attachments} }) {
 
+      my $filename;
+
+      if (ref($attachment) eq "HASH") {
+        $filename = $attachment->{"name"};
+        $attachment = $attachment->{"filename"};
+      } else {
+        $filename = $attachment;
+        # strip path
+        $filename =~ s/(.*\/|$self->{fileid})//g;
+      }
+
       my $application =
         ($attachment =~ /(^\w+$)|\.(html|text|txt|sql)$/)
         ? "text"
@@ -159,11 +170,6 @@ $self->{message}
         return "$attachment : $!";
       }
 
-      my $filename = $attachment;
-
-      # strip path
-      $filename =~ s/(.*\/|$self->{fileid})//g;
-
       print OUT qq|--${boundary}
 Content-Type: $application/$self->{format}; name="$filename"; charset="$self->{charset}"
 Content-Transfer-Encoding: BASE64