Skip to content

bugzilla
bugzilla
Commit 5fd2b62a authored by Albert Ting's avatar Albert Ting Committed by Frédéric Buclin
Browse files
Options

Bug 1196517: Properly set the disposition for non-viewable attachments

r=LpSolit a=sgreen
parent 19d20ef6
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
attachment.cgi
View file @ 5fd2b62a
...@@ -346,7 +346,8 @@ sub view { ...@@ -346,7 +346,8 @@ sub view {
local $Encode::Encoding{'MIME-Q'}->{'bpl'} = 10000; local $Encode::Encoding{'MIME-Q'}->{'bpl'} = 10000;
$filename = encode('MIME-Q', $filename); $filename = encode('MIME-Q', $filename);
my $disposition = Bugzilla->params->{'allow_attachment_display'} ? 'inline' : 'attachment'; my $disposition = (Bugzilla->params->{'allow_attachment_display'}
&& $attachment->is_viewable) ? 'inline' : 'attachment';
# Don't send a charset header with attachments--they might not be UTF-8. # Don't send a charset header with attachments--they might not be UTF-8.
# However, we do allow people to explicitly specify a charset if they # However, we do allow people to explicitly specify a charset if they
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment