Bug 138582 - convert all INCLUDEs to PROCESS. Patch by gerv, r=bbaetz, afranke.

diff --git a/template/en/default/account/create.html.tmpl b/template/en/default/account/create.html.tmpl
index fd1a5edfe33d6e27c25c5a19721294fcb798b98b..da8979c912cbcbca9acf97ded0e6caef474337c1 100644 (file)
--- a/template/en/default/account/create.html.tmpl
+++ b/template/en/default/account/create.html.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl 
   title = "Create a new Bugzilla account"
 %]
 
@@ -55,4 +55,4 @@
   <input type="submit" value="Create Account">
 </form>
 
-[% INCLUDE global/footer.html.tmpl %] 
+[% PROCESS global/footer.html.tmpl %] 

diff --git a/template/en/default/account/created.html.tmpl b/template/en/default/account/created.html.tmpl
index 2a59eb60a088614de503d198136c1078fe7e283a..314b71e470113a2c423f5852d939898237f3f5a1 100644 (file)
--- a/template/en/default/account/created.html.tmpl
+++ b/template/en/default/account/created.html.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl 
   title = "Account Created"
 %]
 
@@ -35,4 +35,4 @@
   <a href="query.cgi?GoAheadAndLogIn=1">log in here</a>.
 </p>
 
-[% INCLUDE global/footer.html.tmpl %] 
+[% PROCESS global/footer.html.tmpl %] 

diff --git a/template/en/default/account/email/confirm.html.tmpl b/template/en/default/account/email/confirm.html.tmpl
index 0773df6b1d2f1f3d84829973bb670ce16fdb5ea9..5fd1570e6c42b5ba2a776919e1ff6e7865c5ddaa 100644 (file)
--- a/template/en/default/account/email/confirm.html.tmpl
+++ b/template/en/default/account/email/confirm.html.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s):     John Vandenberg <zeroj@null.net>
   #%]
 
-[% INCLUDE global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl %]
 
 
 <p>
@@ -41,4 +41,4 @@
   </table>
 </form>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/account/exists.html.tmpl b/template/en/default/account/exists.html.tmpl
index 2553763f233af6c50a992f7cae21d3df69d1d417..912b117f91996c63a0fbb06a35a4aad9c282f110 100644 (file)
--- a/template/en/default/account/exists.html.tmpl
+++ b/template/en/default/account/exists.html.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl 
   title = "Account Exists"
 %]
 
@@ -31,4 +31,4 @@
   <input type="submit" value="submit a request to change it" />.
 </form>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/account/password/set-forgotten-password.html.tmpl b/template/en/default/account/password/set-forgotten-password.html.tmpl
index 675db62d166b7549088a37c81e2476c893316327..eb1abe746ad4cc199f476c961aa0b853dc095625 100644 (file)
--- a/template/en/default/account/password/set-forgotten-password.html.tmpl
+++ b/template/en/default/account/password/set-forgotten-password.html.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl %]
 
 <p>
   To change your password, enter a new password twice:
@@ -52,4 +52,4 @@
   </table>
 </form>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/account/prefs/prefs.html.tmpl b/template/en/default/account/prefs/prefs.html.tmpl
index 9c103661b150527bda35680e7743938fb91a5856..17ce7b5d6a3021ef40f0fdd389081a54b1c12d2b 100644 (file)
--- a/template/en/default/account/prefs/prefs.html.tmpl
+++ b/template/en/default/account/prefs/prefs.html.tmpl
@@ -36,7 +36,7 @@
   #%]
 
 [% filtered_login = login FILTER html %]
-[% INCLUDE global/header.html.tmpl
+[% PROCESS global/header.html.tmpl
    title = "User Preferences"
    h2 = filtered_login
    style = "td.selected_tab {
@@ -90,7 +90,7 @@
 <form method="post">
   <input type="hidden" name="tab" value="[% current_tab.name %]">
 
-  [% INCLUDE "account/prefs/${current_tab.name}.html.tmpl" IF current_tab.name.defined %]
+  [% PROCESS "account/prefs/${current_tab.name}.html.tmpl" IF current_tab.name.defined %]
 
   [% IF current_tab.saveable %]
     <input type="hidden" name="dosave" value="1">
@@ -107,7 +107,7 @@
   
 </form>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]
 
     
     

diff --git a/template/en/default/admin/attachstatus/create.html.tmpl b/template/en/default/admin/attachstatus/create.html.tmpl
index 1837645ee63f4ab61480d0346cb12ba949c357c2..baf8cbc49a37684437a901760e137f24a8eb6755 100644 (file)
--- a/template/en/default/admin/attachstatus/create.html.tmpl
+++ b/template/en/default/admin/attachstatus/create.html.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s): Myk Melez <myk@mozilla.org>
   #%]
 
-[% INCLUDE global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl 
   title = "Create Attachment Status"
   style = "
     th { text-align: right; vertical-align: top; }
@@ -74,4 +74,4 @@
   </table>
 </form>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/admin/attachstatus/delete.html.tmpl b/template/en/default/admin/attachstatus/delete.html.tmpl
index 81b2057586312e2bff933eaa328e1b1b1cc90196..e92b9798523e8628fdb5053ece2576e63d9883d4 100644 (file)
--- a/template/en/default/admin/attachstatus/delete.html.tmpl
+++ b/template/en/default/admin/attachstatus/delete.html.tmpl
@@ -23,7 +23,7 @@
 [%# Filter off the name here to be used multiple times below %]
 [% name = name FILTER html %]
 
-[% INCLUDE global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl 
   title = "Confirm Delete of Attachment Status '$name'" 
 %]
 
@@ -52,4 +52,4 @@
    </tr>
 </table>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/admin/attachstatus/edit.html.tmpl b/template/en/default/admin/attachstatus/edit.html.tmpl
index 9bdfa1a5e464a45821d468ecdee60abaaea07329..ef8d5cf6a7c2a62c8a2efc744d5c06bdc2e8abe7 100644 (file)
--- a/template/en/default/admin/attachstatus/edit.html.tmpl
+++ b/template/en/default/admin/attachstatus/edit.html.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s): Myk Melez <myk@mozilla.org>
   #%]
 
-[% INCLUDE global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl 
   title = "Edit Attachment Status"
   style = "
     th { text-align: right; vertical-align: top; }
@@ -70,4 +70,4 @@
   </table>
 </form>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/admin/attachstatus/list.html.tmpl b/template/en/default/admin/attachstatus/list.html.tmpl
index 1bb4126b901b9ad3b16529b149bf75b14c65a165..e03b7dc7a726431fc0cd76feb9a6c7be8c664398 100644 (file)
--- a/template/en/default/admin/attachstatus/list.html.tmpl
+++ b/template/en/default/admin/attachstatus/list.html.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s): Myk Melez <myk@mozilla.org>
   #%]
 
-[% INCLUDE global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl 
   title = 'Administer Attachment Statuses'
   message = message
   style = "
@@ -86,4 +86,4 @@
   }
 </script>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl
index fd0b67d9da5a1e44d189b8775d36ba2ad02ff4d1..d31ef1292816643066ce4e92377c83694d02a81e 100644 (file)
--- a/template/en/default/attachment/create.html.tmpl
+++ b/template/en/default/attachment/create.html.tmpl
@@ -24,7 +24,7 @@
 [% h1 = BLOCK %]Create New Attachment for <a href="show_bug.cgi?id=[% bugid %]">Bug #[% bugid %]</a>[% END %]
 [% h2 = BLOCK %][% bugsummary FILTER html %][% END %]
 
-[% INCLUDE global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl 
   title = title
   h1 = h1
   h2 = h2
@@ -124,7 +124,7 @@
   //-->
 </script>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]
 
 
 

diff --git a/template/en/default/attachment/created.html.tmpl b/template/en/default/attachment/created.html.tmpl
index 466b7da5fc282536b812aee4144822b2eb31fa0b..b4af46e808eb29dcb84fc959824f9c13e8736345 100644 (file)
--- a/template/en/default/attachment/created.html.tmpl
+++ b/template/en/default/attachment/created.html.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s): Myk Melez <myk@mozilla.org>
   #%]
 
-[% INCLUDE global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl 
   title = "Changes Submitted"
   style = "th { text-align: left; }"
 %]
@@ -53,4 +53,4 @@
 <a href="attachment.cgi?bugid=[% bugid %]&action=enter">Create Another Attachment to Bug #[% bugid %]</a>
 </p>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl
index 0f08cd2affc23dc47f1b5fa7141031a6a518d1fe..26db832d38600256773e62115ed6db3e7ed675ad 100644 (file)
--- a/template/en/default/attachment/edit.html.tmpl
+++ b/template/en/default/attachment/edit.html.tmpl
@@ -24,7 +24,7 @@
 [% h1 = BLOCK %]Edit Attachment #[% attachid %] for <a href="show_bug.cgi?id=[% bugid %]">Bug #[% bugid %]</a>[% END %]
 [% h2 = BLOCK %][% bugsummary FILTER html %][% END %]
 
-[% INCLUDE global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl 
   title = title
   h1 = h1
   h2 = h2
@@ -223,4 +223,4 @@
 
 <br>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/attachment/show-multiple.html.tmpl b/template/en/default/attachment/show-multiple.html.tmpl
index 7fc7d60ab06ed3a121ca40910e2bdf01ad2559d5..83a0642a7c17800507f3889c7e8563d5d28ac025 100644 (file)
--- a/template/en/default/attachment/show-multiple.html.tmpl
+++ b/template/en/default/attachment/show-multiple.html.tmpl
@@ -20,7 +20,7 @@
   #%]
 
 [% filtered_summary = bugsummary FILTER html %]
-[% INCLUDE global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl 
   title = "View All Attachments for Bug #$bugid"
   h1 = "View All Attachments for <a href=\"show_bug.cgi?id=$bugid\">Bug #$bugid</a>"
   h2 = filtered_summary
@@ -95,4 +95,4 @@
 
 [% END %]
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/attachment/updated.html.tmpl b/template/en/default/attachment/updated.html.tmpl
index eec9c6f3a81aed6da279e194083e95db8f2ea3a3..d522c638d14bcffca8fd5e4e85e14d2e51f56ebb 100644 (file)
--- a/template/en/default/attachment/updated.html.tmpl
+++ b/template/en/default/attachment/updated.html.tmpl
@@ -20,7 +20,7 @@
   #                 Gervase Markham <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl 
   title = "Changes Submitted"
   style = "th { text-align: left; }"
 %]
@@ -43,4 +43,4 @@
   </tr>
 </table>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/bug/activity/show.html.tmpl b/template/en/default/bug/activity/show.html.tmpl
index d3ca1ac0b34e79f8ee6da1dfafdca7d1a3dad340..9bd0e0b379785efc94592d780cb61f53ab3157a5 100644 (file)
--- a/template/en/default/bug/activity/show.html.tmpl
+++ b/template/en/default/bug/activity/show.html.tmpl
@@ -26,7 +26,7 @@
   # activity.html.tmpl template fulfilled.
   #%]
  
-[% INCLUDE global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl 
   title = "Changes made to bug $bug_id"
   h1 = "Activity log"
   h2 = "Bug <a href='show_bug.cgi?id=$bug_id'>$bug_id</a>"
@@ -34,10 +34,10 @@
 
 <br>
 
-[% INCLUDE bug/activity/table.html.tmpl %]
+[% PROCESS bug/activity/table.html.tmpl %]
 
 <p>
   <a href="show_bug.cgi?id=[% bug_id %]">Back to bug [% bug_id %]</a>
 </p>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/bug/choose-xml.html.tmpl b/template/en/default/bug/choose-xml.html.tmpl
index 65d579679020f511072347175751df7ce3a1bfe5..d6bae93f6b8cabf10e93c413649d8cab0bd605d6 100644 (file)
--- a/template/en/default/bug/choose-xml.html.tmpl
+++ b/template/en/default/bug/choose-xml.html.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl 
    title = "Display bugs as XML"
  %]
 
@@ -44,4 +44,4 @@
   </table>
 </form>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/bug/choose.html.tmpl b/template/en/default/bug/choose.html.tmpl
index f6c08adb601b167c336d46e617a650363f103f09..a9a62567c16da96e7a107ea1c66247ce8e4db6c1 100644 (file)
--- a/template/en/default/bug/choose.html.tmpl
+++ b/template/en/default/bug/choose.html.tmpl
@@ -20,7 +20,7 @@
   #%]
 
 [% UNLESS header_done %]
-  [% INCLUDE global/header.html.tmpl 
+  [% PROCESS global/header.html.tmpl 
      title = "Search by bug number"
    %]
 [% END %]
@@ -33,4 +33,4 @@
   </p>
 </form>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 46995305c01eba14719ce488284473338714112b..fe9688acdcf310d7eb83312897d05e2ce0d7cdf1 100644 (file)
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -20,7 +20,7 @@
   #                 Ville Skyttä <ville.skytta@iki.fi>
   #%]
 
-[% INCLUDE global/header.html.tmpl
+[% PROCESS global/header.html.tmpl
   title = "Enter Bug"
   h2 = "This page lets you enter a new bug into Bugzilla."
 %]
@@ -230,7 +230,7 @@
   <input type="hidden" name="form_name" value="enter_bug">
 </form>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]
 
 [%############################################################################%]
 [%# Block for SELECT fields                                                  #%]

diff --git a/template/en/default/bug/create/created.html.tmpl b/template/en/default/bug/create/created.html.tmpl
index 431e478d1e01be1efe8bade11ab84d8e94a2ee1d..7693fdbcf4e8c9a66d884891e8ee026a246e4af9 100644 (file)
--- a/template/en/default/bug/create/created.html.tmpl
+++ b/template/en/default/bug/create/created.html.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl 
   title = "Bug $bug_id Submitted"
 %]
 
@@ -42,6 +42,6 @@
   Attach a file to this bug</a>.
 </p>
 
-[% INCLUDE bug/navigate.html.tmpl %]
+[% PROCESS bug/navigate.html.tmpl %]
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/bug/create/make-template.html.tmpl b/template/en/default/bug/create/make-template.html.tmpl
index 844a0bc355e5b4abc904eeb8d64c7489a204d095..1e2495ff86fbd1d2f91ca8a5452862654a2497e5 100644 (file)
--- a/template/en/default/bug/create/make-template.html.tmpl
+++ b/template/en/default/bug/create/make-template.html.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl 
   title = "Bookmarks are your friend"
   h1 = "Template constructed"
 %]
@@ -30,4 +30,4 @@ going to the bookmark will bring up the enter bug page with the fields
 initialized as you've requested.
 </p>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/bug/dependency-graph.html.tmpl b/template/en/default/bug/dependency-graph.html.tmpl
index 631e49e5f579d138dee73bafcfae76695af54c47..8521a0c35fb49c0f81ae0cf64488c0ce5d388ddb 100644 (file)
--- a/template/en/default/bug/dependency-graph.html.tmpl
+++ b/template/en/default/bug/dependency-graph.html.tmpl
@@ -40,7 +40,7 @@
    %]
 [% END %]
 
-[% INCLUDE global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl %]
 
 <p>
   Green circles represent open bugs.
@@ -95,4 +95,4 @@
   <input type="submit" value="Change Parameters">
 </form>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index b7b0d69958419fda1540491683333e7a1f14b507..deeb4e24d6353bd17f8cae9d7b5633882c2c2e1c 100644 (file)
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -21,7 +21,7 @@
 
 [% filtered_desc = bug.short_desc FILTER html %]
 [% UNLESS header_done %]
-  [% INCLUDE global/header.html.tmpl 
+  [% PROCESS global/header.html.tmpl 
     title = "Bug $bug.bug_id - $bug.short_desc"
     h1 = "Bugzilla Bug $bug.bug_id"
     h2 = filtered_desc
@@ -250,7 +250,7 @@
   
 [%# *** Attachments *** %]
 
-  [% INCLUDE attachment/list.html.tmpl 
+  [% PROCESS attachment/list.html.tmpl 
      attachments = bug.attachments 
      bugid = bug.bug_id %]
 
@@ -501,7 +501,7 @@
 
 <br>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]
 
 
 [%############################################################################%]

diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl
index 970af35ea42b41e296c9fdf89c9ae3a864c31606..0290cb6d4435d0b9f49141e576ba9415572cded3 100644 (file)
--- a/template/en/default/bug/show-multiple.html.tmpl
+++ b/template/en/default/bug/show-multiple.html.tmpl
@@ -20,7 +20,7 @@
   #                 Gervase Markham <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl 
   title = "Full Text Bug Listing"
 %]
 
@@ -34,7 +34,7 @@
   </p>
 [% END %]
 
-[% INCLUDE global/footer %]
+[% PROCESS global/footer.html.tmpl %]
 
 
 [%###########################################################################%]

diff --git a/template/en/default/bug/votes/delete-all.html.tmpl b/template/en/default/bug/votes/delete-all.html.tmpl
index 78224e6ecaf172095b048ec5cdb5555067c59e34..f9df23894c930bbe4b85046b64c56ea4538b397d 100644 (file)
--- a/template/en/default/bug/votes/delete-all.html.tmpl
+++ b/template/en/default/bug/votes/delete-all.html.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header.html.tmpl
+[% PROCESS global/header.html.tmpl
            title = "Remove your votes?"
  %]
 
@@ -43,4 +43,4 @@
   </p>
 </form>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/bug/votes/list-for-bug.html.tmpl b/template/en/default/bug/votes/list-for-bug.html.tmpl
index 44554f0ca9c632ee0c6841ea5ead0cf39a922093..b58ba6ff480cd496b7027946705b6b71ff3ed650 100644 (file)
--- a/template/en/default/bug/votes/list-for-bug.html.tmpl
+++ b/template/en/default/bug/votes/list-for-bug.html.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header.html.tmpl
+[% PROCESS global/header.html.tmpl
            title = "Show Votes"
            h2 = "Bug <a href='show_bug.cgi?id=$bug_id'>$bug_id</a>"
  %]
@@ -46,4 +46,4 @@
 
 <p>Total votes: [% total %]</p>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/bug/votes/list-for-user.html.tmpl b/template/en/default/bug/votes/list-for-user.html.tmpl
index e8850fc9468df80bd464ad3b67e383d8039d93c1..261e0f86438379692db1918dc66afcf1424a6d5f 100644 (file)
--- a/template/en/default/bug/votes/list-for-user.html.tmpl
+++ b/template/en/default/bug/votes/list-for-user.html.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header.html.tmpl
+[% PROCESS global/header.html.tmpl
            title = "Show Votes"
            h2 = user.name
  %]
@@ -127,4 +127,4 @@
   <a href="votehelp.html">Help with voting</a>.
 </p>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/global/choose-product.html.tmpl b/template/en/default/global/choose-product.html.tmpl
index 03dd356ddbd83ece9af28f3db9b3a29c45b9fdcb..1d68f7fe77a92c2ee9737bc89c271f052b67844d 100644 (file)
--- a/template/en/default/global/choose-product.html.tmpl
+++ b/template/en/default/global/choose-product.html.tmpl
@@ -20,7 +20,7 @@
   #%]
 
 [% DEFAULT title = "Choose a Product" %]
-[% INCLUDE global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl %]
 
 <table>
 
@@ -39,4 +39,4 @@
         
 </table>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index f9261b20fe335144860a02c214840ccb80c3d67b..b0f21f7ffc25bb162bb74f10e76ed63c9ef3e028 100644 (file)
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -20,7 +20,7 @@
   #%]
 
 [% UNLESS header_done %]
-  [% INCLUDE global/header.html.tmpl %]
+  [% PROCESS global/header.html.tmpl %]
 [% END %]
 
 <tt>
@@ -54,4 +54,4 @@ Variables:
   </pre>
 [% END %]
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 3b0819f531300137d4c7d777d77ac2b01765dd18..d2e527dda50d8fdf33b4b4d07986218a352ab9f1 100644 (file)
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -20,7 +20,7 @@
   #%]
 
 [% UNLESS header_done %]
-  [% INCLUDE global/header.html.tmpl %]
+  [% PROCESS global/header.html.tmpl %]
 [% END %]
 
 <table cellpadding="20">
@@ -37,4 +37,4 @@
   Please press <b>Back</b> and try again.
 </p>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl
index 118e04339a5cc9263c00283e71588bf1ae7fb9b6..35e4e9c85705c3e391b813cf609d29ba2b0e6e89 100644 (file)
--- a/template/en/default/index.html.tmpl
+++ b/template/en/default/index.html.tmpl
@@ -21,7 +21,7 @@
   #                 Jacob Steenhagen <jake@acutex.net>
   #%]
 
-[% INCLUDE global/header.html.tmpl
+[% PROCESS global/header.html.tmpl
   title = 'Bugzilla Main Page'
 %]
 
@@ -85,4 +85,4 @@ document.forms['f'].id.focus();
 //-->
 </script>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/list/change-columns.html.tmpl b/template/en/default/list/change-columns.html.tmpl
index e67b347b6d885ab96b927ae7658b6ce7c51a9d69..96e56e8eb95c1e9555970f372842fe29b76bf8fa 100644 (file)
--- a/template/en/default/list/change-columns.html.tmpl
+++ b/template/en/default/list/change-columns.html.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s): Dave Lawrence <dkl@redhat.com>
   #%]
 
-[% INCLUDE global/header.html.tmpl
+[% PROCESS global/header.html.tmpl
   title = "Change Columns"
 %]
 
@@ -47,5 +47,5 @@ on submit.  (Cookies are required.)
 </form>
 </p>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]
 

diff --git a/template/en/default/list/quips.html.tmpl b/template/en/default/list/quips.html.tmpl
index d7d2a04d64210d820071961d8b53c74098ffd031..1d6143dfe16e884ace11affeae0f7125b1f8ebea 100644 (file)
--- a/template/en/default/list/quips.html.tmpl
+++ b/template/en/default/list/quips.html.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header.html.tmpl
+[% PROCESS global/header.html.tmpl
            title = "Bugzilla Quip System"
            h1 = "Add your own clever headline"
  %]
@@ -62,4 +62,4 @@
   </p>
 [% END %]
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/reports/components.html.tmpl b/template/en/default/reports/components.html.tmpl
index 0241d39097e7ee24a9df65af0deabe39190e5703..9f275eda7282eedf13d4c91cafee9ef347f750c2 100644 (file)
--- a/template/en/default/reports/components.html.tmpl
+++ b/template/en/default/reports/components.html.tmpl
@@ -20,7 +20,7 @@
   #%]
 
 [% filtered_product = product FILTER html %]
-[% INCLUDE global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl 
   title = "Components for $product"
   h2 = filtered_product %]
 
@@ -53,7 +53,7 @@
   </table>
 [% END %]
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]
 
 [%############################################################################%]
 [%# BLOCK for components                                                      %]

diff --git a/template/en/default/reports/duplicates.html.tmpl b/template/en/default/reports/duplicates.html.tmpl
index f442bd54fe015b35ed3dc8a0380c10b2e64da285..48c2bc7966866f451f0769a3841b3d22bd7cbee0 100644 (file)
--- a/template/en/default/reports/duplicates.html.tmpl
+++ b/template/en/default/reports/duplicates.html.tmpl
@@ -48,7 +48,7 @@
   [% title = "Most Frequently Reported Bugs" %]
 [% END%]
 
-[% INCLUDE global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl %]
 
 <p>
   <a href="#explanation">What is this data?</a>
@@ -273,4 +273,4 @@
   </ul>
 </ul>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/reports/keywords.html.tmpl b/template/en/default/reports/keywords.html.tmpl
index 17d623e4e7d1e43d851f866e11738871d6519af2..28f684f4612e120b454e3411d76a6c84d69d3fd9 100644 (file)
--- a/template/en/default/reports/keywords.html.tmpl
+++ b/template/en/default/reports/keywords.html.tmpl
@@ -27,7 +27,7 @@
   # caneditkeywords: boolean. True if this user can edit keywords
  %]
  
-[% INCLUDE global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl 
   title = "Bugzilla Keyword Descriptions"
 %]
 
@@ -72,4 +72,4 @@
   </p>
 [% END %]
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/search/search-advanced.html.tmpl b/template/en/default/search/search-advanced.html.tmpl
index 6523dffd120e6b49e2cc512c10eca21b96265282..ec93e85924d503b37bba08232d0dbc71477631ca 100644 (file)
--- a/template/en/default/search/search-advanced.html.tmpl
+++ b/template/en/default/search/search-advanced.html.tmpl
@@ -21,7 +21,7 @@
   #                 Gervase Markham <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl 
   title = "Search for bugs"
   extra = " onLoad=\"selectProduct(document.forms['queryform']);\""
 %]
@@ -839,7 +839,7 @@ function selectProduct(f) {
 
 </FORM>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]
 
 [%############################################################################%]
 [%# Block for SELECT fields                                                  #%]

diff --git a/template/en/default/search/search.html.tmpl b/template/en/default/search/search.html.tmpl
index 6523dffd120e6b49e2cc512c10eca21b96265282..ec93e85924d503b37bba08232d0dbc71477631ca 100644 (file)
--- a/template/en/default/search/search.html.tmpl
+++ b/template/en/default/search/search.html.tmpl
@@ -21,7 +21,7 @@
   #                 Gervase Markham <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl 
   title = "Search for bugs"
   extra = " onLoad=\"selectProduct(document.forms['queryform']);\""
 %]
@@ -839,7 +839,7 @@ function selectProduct(f) {
 
 </FORM>
 
-[% INCLUDE global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]
 
 [%############################################################################%]
 [%# Block for SELECT fields                                                  #%]