X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FCGI%2FBugreport.pm;h=d4800cd3c7df1f0440962f20c49d457eec8d491a;hb=948b8e160cac1b36c6099feeb61ae2fe91271b61;hp=29602c58c39f1088bc17208e49ab28c1561ac152;hpb=e26e4c2c8243d3e6f9f461f5b59e4abb3b761f84;p=debbugs.git diff --git a/Debbugs/CGI/Bugreport.pm b/Debbugs/CGI/Bugreport.pm index 29602c5..d4800cd 100644 --- a/Debbugs/CGI/Bugreport.pm +++ b/Debbugs/CGI/Bugreport.pm @@ -40,7 +40,7 @@ use Debbugs::Common qw(globify_scalar english_join); use Debbugs::UTF8; use Debbugs::Config qw(:config); use POSIX qw(strftime); -use Encode qw(decode_utf8); +use Encode qw(decode_utf8 encode_utf8); BEGIN{ ($VERSION) = q$Revision: 494 $ =~ /^Revision:\s+([^\s+])/; @@ -116,7 +116,7 @@ sub display_entity { } ); - $param{output} = globify_scalar($param{output}); + my $output = globify_scalar($param{output}); my $entity = $param{entity}; my $ref = $param{bug_num}; my $top = $param{outer}; @@ -135,25 +135,26 @@ sub display_entity { not $param{terse} and not exists $param{att}) { my $header = $entity->head; - print {$param{output}} "
$_: ) . html_escape(decode_rfc1522($head_field))."
"; + push @headers, qq($_: ) . html_escape(decode_rfc1522($head_field))."
\n"; } - print {$param{output}} join(qq(), @headers); + print {$output} join(qq(), @headers); } else { - print {$param{output}} "".html_escape(decode_rfc1522($entity->head->stringify))."\n"; + print {$output} "
".html_escape(decode_rfc1522($entity->head->stringify))."\n"; } - print {$param{output}} "
[[parts) { # We must be dealing with a nested message. if (not exists $param{att}) { - print {$param{output}} "\n"; + print {$output} "\n"; } } elsif (not $param{terse}) { my $content_type = $entity->head->get('Content-Type:') || "text/html"; @@ -277,7 +278,7 @@ sub display_entity { {$1$2$3}gxm; } if (not exists $param{att}) { - print {$param{output}} qq( \n); + print {$output} qq( \n); } } } @@ -299,9 +300,8 @@ appropriate. sub handle_email_message{ my ($email,%param) = @_; - # output needs to have the is_utf8 flag on to avoid double - # encoding - my $output = decode_utf8(''); + my $output; + my $output_fh = globify_scalar(\$output); my $parser = MIME::Parser->new(); # Because we are using memory, not tempfiles, there's no need to # clean up here like in Debbugs::MIME @@ -313,15 +313,14 @@ sub handle_email_message{ bug_num => $param{ref}, outer => 1, msg_num => $param{msg_num}, - output => \$output, + 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}):(), ); - return $output; - + return decode_utf8($output); } =head2 handle_record\n"; } my @parts = $entity->parts; foreach my $part (@parts) { @@ -234,16 +235,16 @@ sub display_entity { bug_num => $ref, outer => 1, msg_num => $xmessage, - output => $param{output}, + output => $output, attachments => $attachments, terse => $param{terse}, exists $param{msg}?(msg=>$param{msg}):(), exists $param{att}?(att=>$param{att}):(), ); - # print {$param{output}} "\n"; + # print {$output} "\n"; } if (not exists $param{att}) { - print {$param{output}} "\n"; + print {$output} "