From 2fde460927e475d9f55cefde4eebf53e643a4edc Mon Sep 17 00:00:00 2001
From: Kohei Yoshino <kohei.yoshino@gmail.com>
Date: Mon, 1 Oct 2018 11:43:11 -0400
Subject: Bug 1494645 - Allow customizing HTML <title> of search results

---
 buglist.cgi                             |  9 +++++----
 template/en/default/list/list.html.tmpl | 10 +++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/buglist.cgi b/buglist.cgi
index 019bf0d4e..8de38599f 100755
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -590,9 +590,6 @@ if ($format->{'extension'} eq 'ics') {
 }
 
 if ($format->{'extension'} eq 'atom') {
-    # The title of the Atom feed will be the same one as for the bug list.
-    $vars->{'title'} = $cgi->param('title');
-
     # This is the list of fields that are needed by the Atom filter.
     my @required_atom_columns = (
       'short_desc',
@@ -1060,6 +1057,10 @@ $vars->{'defaultsavename'} = $cgi->param('query_based_on');
 # string in the text field.
 $vars->{'quicksearch'} = $searchstring;
 
+# Allow to custimize the title of HTML page and Atom feed. Also allow to pass
+# the title from HTML page to Atom feed through a link.
+$vars->{'title'} = $cgi->param('title');
+
 ################################################################################
 # HTTP Header Generation
 ################################################################################
@@ -1103,4 +1104,4 @@ $cgi->close_standby_message($contenttype, $disposition, $disp_prefix, $format->{
 
 # Generate and return the UI (HTML page) from the appropriate template.
 $template->process($format->{'template'}, $vars)
-  || ThrowTemplateError($template->error());
\ No newline at end of file
+  || ThrowTemplateError($template->error());
diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index 8831bcb7d..fe4354a61 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -30,11 +30,11 @@
 
 [% PROCESS "global/field-descs.none.tmpl" %]
 
-[% title = "$terms.Bug List" %]
-[% IF searchname || defaultsavename %]
-  [% title = title _ ": " _ (searchname OR defaultsavename) FILTER html %]
-[% ELSIF quicksearch %]
-  [% title = title _ ": " _ quicksearch FILTER html %]
+[% DEFAULT title = "$terms.Bug List" %]
+[% IF searchname || defaultsavename || quicksearch %]
+  [% title = title _ ": " _ (searchname || defaultsavename || quicksearch) FILTER html %]
+[% ELSE %]
+  [% title = title FILTER html %]
 [% END %]
 
 [% qorder = order FILTER uri IF order %]
-- 
cgit v1.2.3-24-g4f1b