X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FCGI%2FBugreport.pm;h=a6063944a07b5edd1048639d17c6c8d1abecb085;hb=e09c4d3c9adb00e42d9af5daf9b1d5dd04264e6b;hp=dccae9541f5b9934335463579c778fe37a9d3fa0;hpb=0c2305d4c89d165140bc955a50f3248c9c9ba7ad;p=debbugs.git

diff --git a/Debbugs/CGI/Bugreport.pm b/Debbugs/CGI/Bugreport.pm
index dccae95..a606394 100644
--- a/Debbugs/CGI/Bugreport.pm
+++ b/Debbugs/CGI/Bugreport.pm
@@ -37,7 +37,7 @@ use Digest::MD5 qw(md5_hex);
 use Debbugs::Mail qw(get_addresses :reply);
 use Debbugs::MIME qw(decode_rfc1522 create_mime_message parse_to_mime_entity);
 use Debbugs::CGI qw(:url :html :util);
-use Debbugs::Common qw(globify_scalar english_join);
+use Debbugs::Common qw(globify_scalar english_join hash_slice);
 use Debbugs::UTF8;
 use Debbugs::Config qw(:config);
 use Debbugs::Log qw(:read);
@@ -226,9 +226,7 @@ sub display_entity {
                                output => $output,
                                attachments => $attachments,
                                terse => $param{terse},
-                               exists $param{msg}?(msg=>$param{msg}):(),
-                               exists $param{att}?(att=>$param{att}):(),
-                               exists $param{avatars}?(avatars=>$param{avatars}):(),
+                               hash_slice(%param,qw(msg att avatars)),
                               );
             if ($raw_output) {
                 return $raw_output;
@@ -249,9 +247,7 @@ sub display_entity {
 			   output => $output,
 			   attachments => $attachments,
 			   terse => $param{terse},
-			   exists $param{msg}?(msg=>$param{msg}):(),
-			   exists $param{att}?(att=>$param{att}):(),
-                           exists $param{avatars}?(avatars=>$param{avatars}):(),
+                           hash_slice(%param,qw(msg att avatars)),
 			  );
 	    # print {$output} "\n";
 	}
@@ -348,10 +344,8 @@ sub handle_email_message{
                         output => $output_fh,
                         attachments => \@attachments,
                         terse       => $param{terse},
-                        exists $param{msg}?(msg=>$param{msg}):(),
-                        exists $param{att}?(att=>$param{att}):(),
-                        exists $param{trim_headers}?(trim_headers=>$param{trim_headers}):(),
-                        exists $param{avatars}?(avatars=>$param{avatars}):(),
+                        hash_slice(%param,qw(msg att trim_headers avatars),
+                                  ),
                        );
      return $raw_output?$output:decode_utf8($output);
 }
@@ -466,6 +460,7 @@ sub handle_record{
           # this will be cleaned up once it goes out of scope
           my $tempdir = File::Temp->newdir();
           $parser->output_under($tempdir->dirname());
+         $parser->filer->ignore_filename(1);
          my $entity;
          if ($record->{inner_file}) {
              $entity = $parser->parse($record->{fh});
@@ -506,9 +501,7 @@ sub __libravatar_url {
 
 
 __END__
-
-
-
-
-
-
+# Local Variables:
+# cperl-indent-level: 4
+# indent-tabs-mode: nil
+# End: