From 88e0ac4cb8bd8932005341e47ee7310a956366d7 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Mon, 13 Feb 2012 23:36:05 +0800
Subject: Bug 725923: backport bug 663835 to extend test coverage to extensions

---
 .../BMO/template/en/default/pages/etiquette.html.tmpl    |  8 ++++----
 .../template/en/default/pages/user_activity.html.tmpl    | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

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

diff --git a/extensions/BMO/template/en/default/pages/etiquette.html.tmpl b/extensions/BMO/template/en/default/pages/etiquette.html.tmpl
index 8bccaea9d..23302cbb5 100644
--- a/extensions/BMO/template/en/default/pages/etiquette.html.tmpl
+++ b/extensions/BMO/template/en/default/pages/etiquette.html.tmpl
@@ -20,16 +20,16 @@
   #                 Gervase Markham <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header.html.tmpl 
-   title = "$terms.Bugzilla Etiquette" 
+[% PROCESS global/header.html.tmpl 
+   title = "Bugzilla Etiquette" 
    style = "li { margin: 5px } .heading { font-weight: bold }" %]
 
 <p>
   There's a number of <i lang="fr">faux pas</i> you can commit when using 
-  [% terms.Bugzilla %]. At the very   
+  [%+ terms.Bugzilla %]. At the very   
   least, these will make Mozilla contributors upset at you; if committed enough    
   times they will cause those contributors to demand the disabling of your
-  [% terms.Bugzilla %] account. So, ignore this advice at your peril. 
+  [%+ terms.Bugzilla %] account. So, ignore this advice at your peril. 
 </p>
 
 <p>
diff --git a/extensions/BMO/template/en/default/pages/user_activity.html.tmpl b/extensions/BMO/template/en/default/pages/user_activity.html.tmpl
index 6982148cd..3e6695484 100644
--- a/extensions/BMO/template/en/default/pages/user_activity.html.tmpl
+++ b/extensions/BMO/template/en/default/pages/user_activity.html.tmpl
@@ -144,7 +144,7 @@
           [% END %]
           <td>
             [% IF change.attachid %]
-              <a href="attachment.cgi?id=[% change.attachid FILTER url %]"
+              <a href="attachment.cgi?id=[% change.attachid FILTER uri %]"
                  title="[% change.attach.description FILTER html %]
                         [%- %] - [% change.attach.filename FILTER html %]"
               >Attachment #[% change.attachid FILTER html %]</a>
@@ -164,7 +164,7 @@
     [% END %]
   </table>
   <p>
-    <a href="buglist.cgi?bug_id=[% bug_ids.join(',') FILTER url %]">
+    <a href="buglist.cgi?bug_id=[% bug_ids.join(',') FILTER uri %]">
     Show as a [% terms.Bug %] List</a>
   </p>
 
@@ -204,16 +204,16 @@
 
 [% BLOCK sort_when_link %]
   <a href="page.cgi?id=user_activity.html&amp;action=run&amp;
-    [%~%]who=[% who FILTER url %]&amp;
-    [%~%]from=[% from FILTER url %]&amp;
-    [%~%]to=[% to FILTER url %]&amp;
+    [%~%]who=[% who FILTER uri %]&amp;
+    [%~%]from=[% from FILTER uri %]&amp;
+    [%~%]to=[% to FILTER uri %]&amp;
     [%~%]sort=when">When</a>
 [% END %]
 
 [% BLOCK sort_bug_link %]
   <a href="page.cgi?id=user_activity.html&amp;action=run&amp;
-    [%~%]who=[% who FILTER url %]&amp;
-    [%~%]from=[% from FILTER url %]&amp;
-    [%~%]to=[% to FILTER url %]&amp;
+    [%~%]who=[% who FILTER uri %]&amp;
+    [%~%]from=[% from FILTER uri %]&amp;
+    [%~%]to=[% to FILTER uri %]&amp;
     [%~%]sort=bug">[% terms.Bug %]</a>
 [% END %]
-- 
cgit v1.2.3-24-g4f1b