Bug 812220: bug_link() is called twice per bug in bug/process/results.html.tmpl

r=glob a=LpSolit

diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index ded22df6b70fdba63bb6a1106c12534f99f06b01..8f85bfe10e70daea3a024e7d636d8476893e11d4 100644 (file)
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -121,12 +121,11 @@ sub REQUIRED_MODULES {
         module  => 'DBI',
         version => (vers_cmp($perl_ver, '5.13.3') > -1) ? '1.614' : '1.54'
     },
-    # 2.22 fixes various problems related to UTF8 strings in hash keys,
-    # as well as line endings on Windows.
+    # 2.24 contains several useful text virtual methods.
     {
         package => 'Template-Toolkit',
         module  => 'Template',
-        version => '2.22'
+        version => '2.24'
     },
     # 2.04 implement the "Test" method (to write to data/mailer.testfile).
     {

diff --git a/template/en/default/bug/process/results.html.tmpl b/template/en/default/bug/process/results.html.tmpl
index cdebfed5eddb3f24a927df0c77a66e5bc14e5281..1d2f99a429eb5bbbade1ecdbca859c09266c2afd 100644 (file)
--- a/template/en/default/bug/process/results.html.tmpl
+++ b/template/en/default/bug/process/results.html.tmpl
@@ -20,23 +20,22 @@
 
 [% DEFAULT type="bug" %]
 
-[% Link = BLOCK %][% "$terms.Bug $id" FILTER bug_link(id) %][% END %]
-[% link = BLOCK %][% "$terms.bug $id" FILTER bug_link(id) %][% END %]
+[% link = BLOCK %][% terms.bug %] [%+ id FILTER bug_link(id) FILTER none %][% END %]
 
 [%
   title = {
     'bug' => "Changes submitted for $link" ,
     'dupe' => "Duplicate notation added to $link" ,
     'dep' => "Checking for dependency changes on $link" ,
-    'created' => "$Link has been added to the database" ,
-    'move' => "$Link has been moved to another database" ,
+    'created' => "$link has been added to the database" ,
+    'move' => "$link has been moved to another database" ,
   }
 %]
 
 [% Hook.process('title') %]
 
 <dl>
-  <dt>[% title.$type %]</dt>
+  <dt>[% title.$type.ucfirst %]</dt>
   <dd>
     [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = id %]
     [%# Links to more information about the changed bug. %]

diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index 44ae2b5da9d745f6b31a388af39c6509f876718d..e12fcb18900f382cbb6761a29b4c58fa9a1ec5a9 100644 (file)
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -267,9 +267,7 @@
 ],
 
 'bug/process/results.html.tmpl' => [
-  'title.$type', 
-  '"$terms.Bug $id" FILTER bug_link(id)',
-  '"$terms.bug $id" FILTER bug_link(id)',
+  'title.$type.ucfirst',
 ],
 
 'bug/create/create.html.tmpl' => [