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

38 files changed, 80 insertions, 80 deletions

diff --git a/template/en/default/account/create.html.tmpl b/template/en/default/account/create.html.tmpl
index fd1a5edfe..da8979c91 100644
--- 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 2a59eb60a..314b71e47 100644
--- 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 0773df6b1..5fd1570e6 100644
--- 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 2553763f2..912b117f9 100644
--- 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 675db62d1..eb1abe746 100644
--- 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 9c103661b..17ce7b5d6 100644
--- 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 1837645ee..baf8cbc49 100644
--- 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 81b205758..e92b97985 100644
--- 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 9bdfa1a5e..ef8d5cf6a 100644
--- 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 1bb4126b9..e03b7dc7a 100644
--- 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 fd0b67d9d..d31ef1292 100644
--- 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 466b7da5f..b4af46e80 100644
--- 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 0f08cd2af..26db832d3 100644
--- 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 7fc7d60ab..83a0642a7 100644
--- 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 eec9c6f3a..d522c638d 100644
--- 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 d3ca1ac0b..9bd0e0b37 100644
--- 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 65d579679..d6bae93f6 100644
--- 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 f6c08adb6..a9a62567c 100644
--- 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 46995305c..fe9688acd 100644
--- 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 431e478d1..7693fdbcf 100644
--- 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 844a0bc35..1e2495ff8 100644
--- 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 631e49e5f..8521a0c35 100644
--- 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 b7b0d6995..deeb4e24d 100644
--- 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 970af35ea..0290cb6d4 100644
--- 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 78224e6ec..f9df23894 100644
--- 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 44554f0ca..b58ba6ff4 100644
--- 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 e8850fc94..261e0f864 100644
--- 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 03dd356dd..1d68f7fe7 100644
--- 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 f9261b20f..b0f21f7ff 100644
--- 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 3b0819f53..d2e527dda 100644
--- 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 118e04339..35e4e9c85 100644
--- 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 e67b347b6..96e56e8eb 100644
--- 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 d7d2a04d6..1d6143dfe 100644
--- 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 0241d3909..9f275eda7 100644
--- 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 f442bd54f..48c2bc796 100644
--- 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 17d623e4e..28f684f46 100644
--- 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 6523dffd1..ec93e8592 100644
--- 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 6523dffd1..ec93e8592 100644
--- 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                                                  #%]