From 6d02055deb5a8bbeff15459f150e129bbf725eab Mon Sep 17 00:00:00 2001
From: Matt Selsky <selsky@columbia.edu>
Date: Mon, 26 Dec 2011 13:48:18 +0100
Subject: Bug 399080: Remove the 'usebugaliases' parameter (turned on
 permanently) r/a=LpSolit

---
 template/en/default/pages/fields.html.tmpl      | 1 -
 template/en/default/pages/quicksearch.html.tmpl | 9 +++------
 2 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'template/en/default/pages')

diff --git a/template/en/default/pages/fields.html.tmpl b/template/en/default/pages/fields.html.tmpl
index 2794e1cc4..c0bf3811d 100644
--- a/template/en/default/pages/fields.html.tmpl
+++ b/template/en/default/pages/fields.html.tmpl
@@ -220,7 +220,6 @@
 
   [% NEXT IF field == 'status_whiteboard' AND !Param('usestatuswhiteboard') %]
   [% NEXT IF field == 'target_milestone' AND !Param('usetargetmilestone') %]
-  [% NEXT IF field == 'alias' AND !Param('usebugaliases') %]
 
   [%# For now we don't have help for attachment fields and so on. %]
   [% NEXT IF field.match('\.') %]
diff --git a/template/en/default/pages/quicksearch.html.tmpl b/template/en/default/pages/quicksearch.html.tmpl
index e6398eade..0e6a9e511 100644
--- a/template/en/default/pages/quicksearch.html.tmpl
+++ b/template/en/default/pages/quicksearch.html.tmpl
@@ -46,17 +46,14 @@
     [%+ field_descs.product FILTER html %],
     [%+ field_descs.component FILTER html %], 
     [%+ IF use_keywords %][%+ field_descs.keywords FILTER html %],[% END %]
-    [%+ IF Param('usebugaliases') %][% field_descs.alias FILTER html %],[% END %]
+    [%+ field_descs.alias FILTER html %],
     [%+ field_descs.short_desc FILTER html %], 
     [%+ IF Param('usestatuswhiteboard') %][% field_descs.status_whiteboard FILTER html %],[% END %]
     and [% field_descs.longdesc FILTER html %] fields for your word or words.</li>
 
   <li>Typing just a <strong>number</strong> in the search box will take
-    you directly to the [% terms.bug %] with that ID. 
-    [% IF Param('usebugaliases') %]
-      Also, just typing the <strong>alias</strong> of [% terms.abug %]
-      will take you to that [% terms.bug %].
-    [% END %]
+    you directly to the [% terms.bug %] with that ID. Also, just typing the
+    <strong>alias</strong> of [% terms.abug %] will take you to that [% terms.bug %].
   </li>
 
   <li>Adding more terms <strong>narrows down</strong> the search, it does not
-- 
cgit v1.2.3-24-g4f1b