From 944f4c76700090704b1d4100fac2db4d647ede67 Mon Sep 17 00:00:00 2001 From: Byron Jones Date: Tue, 1 Dec 2015 15:30:40 +0800 Subject: Bug 1229198 - When saving a buglist from a saved search as a CSV file, set the filename to .csv --- Bugzilla/CGI.pm | 9 ++++----- Bugzilla/Error.pm | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'Bugzilla') diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm index d24722fcc..7d111063d 100644 --- a/Bugzilla/CGI.pm +++ b/Bugzilla/CGI.pm @@ -335,16 +335,15 @@ sub multipart_start { } sub close_standby_message { - my ($self, $contenttype, $disposition) = @_; + my ($self, $contenttype, $disp, $disp_prefix, $extension) = @_; + $self->set_dated_content_disp($disp, $disp_prefix, $extension); if ($self->{_multipart_in_progress}) { print $self->multipart_end(); - print $self->multipart_start(-type => $contenttype, - -content_disposition => $disposition); + print $self->multipart_start(-type => $contenttype); } else { - print $self->header(-type => $contenttype, - -content_disposition => $disposition); + print $self->header($contenttype); } } diff --git a/Bugzilla/Error.pm b/Bugzilla/Error.pm index 8c6888b49..fa898fba4 100644 --- a/Bugzilla/Error.pm +++ b/Bugzilla/Error.pm @@ -118,7 +118,7 @@ sub _throw_error { } my $cgi = Bugzilla->cgi; - $cgi->close_standby_message('text/html', 'inline'); + $cgi->close_standby_message('text/html', 'inline', 'error', 'html'); $template->process($name, $vars) || ThrowTemplateError($template->error()); print $cgi->multipart_final() if $cgi->{_multipart_in_progress}; -- cgit v1.2.3-24-g4f1b