From 944f4c76700090704b1d4100fac2db4d647ede67 Mon Sep 17 00:00:00 2001
From: Byron Jones <glob@mozilla.com>
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 <saved-query-name>.csv

---
 buglist.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'buglist.cgi')

diff --git a/buglist.cgi b/buglist.cgi
index 18a9a7fc2..48c3ac57a 100755
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -344,7 +344,7 @@ $params ||= new Bugzilla::CGI($cgi);
 # at the end, because the fact that there is a remembered query gets 
 # forgotten in the process of retrieving it.
 my $disp_prefix = "bugs";
-if ($cmdtype eq "dorem" && $remaction =~ /^run/) {
+if (($cmdtype eq "dorem" && $remaction =~ /^run/) || ($format->{extension} ne 'html' && defined $cgi->param('namedcmd'))) {
     $disp_prefix = $cgi->param('namedcmd');
 }
 
@@ -1087,7 +1087,7 @@ if ($format->{'extension'} eq "csv") {
     $vars->{'human'} = $cgi->param('human');
 }
 
-$cgi->close_standby_message($contenttype, $disposition);
+$cgi->close_standby_message($contenttype, $disposition, $disp_prefix, $format->{'extension'});
 
 ################################################################################
 # Content Generation
-- 
cgit v1.2.3-24-g4f1b