diff options
| author | Frédéric Buclin <LpSolit@gmail.com> | 2012-11-19 18:05:54 +0100 |
|---|---|---|
| committer | Frédéric Buclin <LpSolit@gmail.com> | 2012-11-19 18:05:54 +0100 |
| commit | 0be9c486f685c2c0061541dec52a8a68e505a04b (patch) | |
| tree | 8ba4880fb16eece90dcc1267038e71760c6e18ae | |
| parent | b0e18c6d38c6e6779ed461391d33f95ec4118ca6 (diff) | |
| download | bugzilla-0be9c486f685c2c0061541dec52a8a68e505a04b.tar.gz bugzilla-0be9c486f685c2c0061541dec52a8a68e505a04b.tar.xz | |
Bug 812220: bug_link() is called twice per bug in bug/process/results.html.tmpl
r=glob a=LpSolit
| -rw-r--r-- | Bugzilla/Install/Requirements.pm | 5 | ||||
| -rw-r--r-- | template/en/default/bug/process/results.html.tmpl | 9 | ||||
| -rw-r--r-- | template/en/default/filterexceptions.pl | 4 |
3 files changed, 7 insertions, 11 deletions
diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm index ded22df6b..8f85bfe10 100644 --- 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 cdebfed5e..1d2f99a42 100644 --- 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 44ae2b5da..e12fcb189 100644 --- 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' => [ |