Bug 696256: global/variables.none.tmpl should be PRE_PROCESS'ed

r/a=mkanat

Bug 696256: global/variables.none.tmpl should be PRE_PROCESS'ed
e9f859e1 · Frédéric Buclin · 408ad74d · e9f859e1 · e9f859e1 · e9f859e1
Commit e9f859e1 authored Oct 23, 2011 by Frédéric Buclin
122 changed files
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -610,7 +610,7 @@ sub create {
        COMPILE_DIR => bz_locations()->{'template_cache'},
        # Initialize templates (f.e. by loading plugins like Hook).
-        PRE_PROCESS => ["global/initialize.none.tmpl"],
+        PRE_PROCESS => ["global/variables.none.tmpl"],
        ENCODING => Bugzilla->params->{'utf8'} ? 'UTF-8' : undef,

--- a/extensions/Voting/template/en/default/pages/voting.html.tmpl
+++ b/extensions/Voting/template/en/default/pages/voting.html.tmpl
@@ -19,7 +19,6 @@
  #                 Gervase Markham <gerv@gerv.net>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% INCLUDE global/header.html.tmpl title = "Voting" %]
 <p>[% terms.Bugzilla %] has a "voting" feature. Each product allows users to 

--- a/extensions/Voting/template/en/default/pages/voting/bug.html.tmpl
+++ b/extensions/Voting/template/en/default/pages/voting/bug.html.tmpl
@@ -26,8 +26,6 @@
  #   vote_count: integer. The number of times that user has votes for this bug.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% subheader = BLOCK %]
  [% "$terms.Bug $bug.id" FILTER bug_link(bug) FILTER none %] - [% bug.short_desc FILTER html %]
 [% END %]

--- a/extensions/Voting/template/en/default/pages/voting/user.html.tmpl
+++ b/extensions/Voting/template/en/default/pages/voting/user.html.tmpl
@@ -38,8 +38,6 @@
  # all_bug_ids: List of all bug ids the user has voted for, across all products
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% IF !header_done %]
  [% subheader = voting_user.login FILTER html %]
  [% IF canedit %]

--- a/extensions/Voting/template/en/default/voting/delete-all.html.tmpl
+++ b/extensions/Voting/template/en/default/voting/delete-all.html.tmpl
@@ -22,8 +22,6 @@
  # This template has no interface.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS global/header.html.tmpl
           title = "Remove your votes?"
 %]

--- a/extensions/Voting/template/en/default/voting/votes-removed.txt.tmpl
+++ b/extensions/Voting/template/en/default/voting/votes-removed.txt.tmpl
@@ -18,8 +18,6 @@
  # Contributor(s): Emmanuel Seyman <eseyman@linagora.com>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 From: [% Param('mailfrom') %]
 To: [% to %]
 Subject: [% terms.Bug %] [%+ bugid %] Some or all of your votes have been removed.

--- a/t/004template.t
+++ b/t/004template.t
@@ -78,7 +78,7 @@ foreach my $include_path (@include_paths) {
        # See Template.pm for the actual codebase definitions.
        # Initialize templates (f.e. by loading plugins like Hook).
-        PRE_PROCESS => "global/initialize.none.tmpl",
+        PRE_PROCESS => "global/variables.none.tmpl",
        FILTERS =>
        {

--- a/template/en/default/account/auth/login-small.html.tmpl
+++ b/template/en/default/account/auth/login-small.html.tmpl
@@ -18,8 +18,6 @@
  # Contributor(s): Jacob Steenhagen <jake@bugzilla.org>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [%# Use the current script name. If an empty name is returned,
  # then we are accessing the home page. %]

--- a/template/en/default/account/auth/login.html.tmpl
+++ b/template/en/default/account/auth/login.html.tmpl
@@ -26,8 +26,6 @@
 [% IF !target %]
 [% target = "index.cgi" %]
 [% END %]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS global/header.html.tmpl
  title = "Log in to $terms.Bugzilla",

--- a/template/en/default/account/cancel-token.txt.tmpl
+++ b/template/en/default/account/cancel-token.txt.tmpl
@@ -19,8 +19,6 @@
  #                     Tobias Burnus <burnus@net-b.de>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 From: [% Param('mailfrom') %]
 To: [% emailaddress %]
 Subject: [% PROCESS subject %]

--- a/template/en/default/account/create.html.tmpl
+++ b/template/en/default/account/create.html.tmpl
@@ -25,8 +25,6 @@
  # Param("emailsuffix") is used to pre-fill the email field.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% title = BLOCK %]
  Create a new [% terms.Bugzilla %] account
 [% END %]

--- a/template/en/default/account/created.html.tmpl
+++ b/template/en/default/account/created.html.tmpl
@@ -23,8 +23,6 @@
  # login: string. The user's Bugzilla login email address.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% title = BLOCK %]
  Request for new user account '[% login FILTER html %]' submitted
 [% END %]

--- a/template/en/default/account/email/change-new.txt.tmpl
+++ b/template/en/default/account/email/change-new.txt.tmpl
@@ -18,8 +18,6 @@
  # Contributor(s):     John Vandenberg <zeroj@null.net>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 From: [% Param('mailfrom') %]
 To: [% emailaddress %]
 Subject: [% terms.Bugzilla %] Change Email Address Request

--- a/template/en/default/account/email/change-old.txt.tmpl
+++ b/template/en/default/account/email/change-old.txt.tmpl
@@ -23,8 +23,6 @@
  # token: string. The token associated with this change.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 From: [% Param('mailfrom') %]
 To: [% emailaddress %]
 Subject: [% terms.Bugzilla %] Change Email Address Request

--- a/template/en/default/account/email/request-new.txt.tmpl
+++ b/template/en/default/account/email/request-new.txt.tmpl
@@ -19,8 +19,6 @@
  # email: email address of the new account.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 From: [% Param('mailfrom') %]
 To: [% email %]
 Subject: [% terms.Bugzilla %]: confirm account creation

--- a/template/en/default/account/password/forgotten-password.txt.tmpl
+++ b/template/en/default/account/password/forgotten-password.txt.tmpl
@@ -18,8 +18,6 @@
  # Contributor(s):     John Vandenberg <zeroj@null.net>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 From: [% Param('mailfrom') %]
 To: [% emailaddress %]
 Subject:  [% terms.Bugzilla %] Change Password Request

--- a/template/en/default/account/prefs/email.html.tmpl
+++ b/template/en/default/account/prefs/email.html.tmpl
@@ -33,8 +33,6 @@
  #               receiving mail for that reason when in that role.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 <p>
  If you don't like getting a notification for "trivial"
  changes to [% terms.bugs %], you can use the settings below to

--- a/template/en/default/account/prefs/permissions.html.tmpl
+++ b/template/en/default/account/prefs/permissions.html.tmpl
@@ -29,8 +29,6 @@
  #           other people.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 <table align="center">
  <tr>
    <td>

--- a/template/en/default/admin/admin.html.tmpl
+++ b/template/en/default/admin/admin.html.tmpl
@@ -13,8 +13,6 @@
  # Contributor(s): Frédéric Buclin <LpSolit@gmail.com>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% title = BLOCK %]
  Administer your installation ([% terms.Bugzilla %]
  [%+ constants.BUGZILLA_VERSION FILTER html %])

--- a/template/en/default/admin/classifications/footer.html.tmpl
+++ b/template/en/default/admin/classifications/footer.html.tmpl
@@ -18,7 +18,5 @@
  # Contributor(s): Nitish Bezzala <nbezzala@yahoo.com>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 <p>Back to the <a href="./">main [% terms.bugs %] page</a>
 or <a href="editclassifications.cgi"> edit</a> more classifications.</p>
--- a/template/en/default/admin/components/edit.html.tmpl
+++ b/template/en/default/admin/components/edit.html.tmpl
@@ -26,8 +26,6 @@
  #               which the component belongs.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% title = BLOCK %]
  Edit component '[% comp.name FILTER html %]' of product '[% product.name FILTER html %]'
 [% END %]

--- a/template/en/default/admin/components/list.html.tmpl
+++ b/template/en/default/admin/components/list.html.tmpl
@@ -25,8 +25,6 @@
  #               which the component belongs.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% title = BLOCK %]Select component of product
                   '[% product.name FILTER html %]'[% END %]
 [% PROCESS global/header.html.tmpl

--- a/template/en/default/admin/components/select-product.html.tmpl
+++ b/template/en/default/admin/components/select-product.html.tmpl
@@ -25,8 +25,6 @@
  # showbugcounts: if defined, then bug counts should be included in the table
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS global/header.html.tmpl
  title = "Edit components for which product?"
 %]

--- a/template/en/default/admin/fieldvalues/edit.html.tmpl
+++ b/template/en/default/admin/fieldvalues/edit.html.tmpl
@@ -18,8 +18,6 @@
  # field: Bugzilla::Field; The field this value belongs to.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% title = BLOCK %]
  Edit Value '[% value.name FILTER html %]' for the 
  '[% field.description FILTER html %]' ([% field.name FILTER html %]) field

--- a/template/en/default/admin/fieldvalues/list.html.tmpl
+++ b/template/en/default/admin/fieldvalues/list.html.tmpl
@@ -26,8 +26,6 @@
 [% USE Bugzilla %]
 [% cgi = Bugzilla.cgi %]
-[% PROCESS global/variables.none.tmpl %]
 [% title = BLOCK %]Select value for the '[% field.description FILTER html %]'
                   ([% field.name FILTER html %]) field[% END %]
 [% PROCESS global/header.html.tmpl

--- a/template/en/default/admin/fieldvalues/select-field.html.tmpl
+++ b/template/en/default/admin/fieldvalues/select-field.html.tmpl
@@ -23,8 +23,6 @@
 [% USE Bugzilla %]
 [% cgi = Bugzilla.cgi %]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS global/header.html.tmpl
  title = "Edit values for which field?"
 %]

--- a/template/en/default/admin/flag-type/confirm-delete.html.tmpl
+++ b/template/en/default/admin/flag-type/confirm-delete.html.tmpl
@@ -18,8 +18,6 @@
  # Contributor(s): Myk Melez <myk@mozilla.org>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% title = BLOCK %]Confirm Deletion of Flag Type '[% flag_type.name FILTER html %]'[% END %]
 [% PROCESS global/header.html.tmpl

--- a/template/en/default/admin/flag-type/edit.html.tmpl
+++ b/template/en/default/admin/flag-type/edit.html.tmpl
@@ -20,8 +20,6 @@
  #                 Frédéric Buclin <LpSolit@gmail.com>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS "global/js-products.html.tmpl" %]
 [% IF action == "insert" %]

--- a/template/en/default/admin/flag-type/list.html.tmpl
+++ b/template/en/default/admin/flag-type/list.html.tmpl
@@ -19,8 +19,6 @@
  #                 Frédéric Buclin <LpSolit@gmail.com>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS "global/js-products.html.tmpl" %]
 [% PROCESS global/header.html.tmpl

--- a/template/en/default/admin/keywords/edit.html.tmpl
+++ b/template/en/default/admin/keywords/edit.html.tmpl
@@ -24,8 +24,6 @@
  # keyword: A Bugzilla::Keyword object.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS global/header.html.tmpl
  title = "Edit keyword"
 %]

--- a/template/en/default/admin/keywords/list.html.tmpl
+++ b/template/en/default/admin/keywords/list.html.tmpl
@@ -28,8 +28,6 @@
  #   - bug_count: number. The number of bugs with the keyword.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS global/header.html.tmpl
  title = "Select keyword"
 %]

--- a/template/en/default/admin/milestones/edit.html.tmpl
+++ b/template/en/default/admin/milestones/edit.html.tmpl
@@ -25,8 +25,6 @@
  #                    milestone the user wants to edit.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% title = BLOCK %]Edit Milestone '[% milestone.name FILTER html %]' of product '
                   [%- product.name FILTER html %]'[% END %]
 [% PROCESS global/header.html.tmpl

--- a/template/en/default/admin/milestones/list.html.tmpl
+++ b/template/en/default/admin/milestones/list.html.tmpl
@@ -28,8 +28,6 @@
 [% USE Bugzilla %]
 [% cgi = Bugzilla.cgi %]
-[% PROCESS global/variables.none.tmpl %]
 [% title = BLOCK %]Select milestone of product
                   '[% product.name FILTER html %]'[% END %]
 [% PROCESS global/header.html.tmpl

--- a/template/en/default/admin/milestones/select-product.html.tmpl
+++ b/template/en/default/admin/milestones/select-product.html.tmpl
@@ -25,8 +25,6 @@
  # showbugcounts: if defined, then bug counts should be included in the table
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS global/header.html.tmpl
  title = "Edit milestones for which product?"
 %]

--- a/template/en/default/admin/params/editparams.html.tmpl
+++ b/template/en/default/admin/params/editparams.html.tmpl
@@ -24,8 +24,6 @@
  # shutdown_is_active: boolean; is true when 'shutdownhtml' has been turned on.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% curpanel = -1 %]
 [% panels = panels.nsort('sortkey') %]

--- a/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl
+++ b/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl
@@ -19,7 +19,6 @@
  #
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% title = BLOCK %]
  Confirm Group Control Change for product '[%- product.name FILTER html %]'
 [% END %]

--- a/template/en/default/admin/products/groupcontrol/edit.html.tmpl
+++ b/template/en/default/admin/products/groupcontrol/edit.html.tmpl
@@ -18,8 +18,6 @@
  # Contributor(s): Joel Peshkin <bugreport@peshkin.net>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% title = BLOCK %]
    Edit Group Controls for [% product.name FILTER html %]
 [% END %]

--- a/template/en/default/admin/products/list-classifications.html.tmpl
+++ b/template/en/default/admin/products/list-classifications.html.tmpl
@@ -21,8 +21,6 @@
  #
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS global/header.html.tmpl
  title = "Select Classification"
 %]

--- a/template/en/default/admin/products/list.html.tmpl
+++ b/template/en/default/admin/products/list.html.tmpl
@@ -22,8 +22,6 @@
  # showbugcounts: boolean; true if bug counts should be included in the table
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% IF classification %]
  [% classification_url_part = BLOCK %]&amp;classification=
    [%- classification.name FILTER uri %]

--- a/template/en/default/admin/sanitycheck/list.html.tmpl
+++ b/template/en/default/admin/sanitycheck/list.html.tmpl
@@ -15,8 +15,6 @@
  # Contributor(s): Frédéric Buclin <LpSolit@gmail.com>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS global/header.html.tmpl title = "Sanity Check"
                                   style_urls = ['skins/standard/admin.css'] %]

--- a/template/en/default/admin/sanitycheck/messages.html.tmpl
+++ b/template/en/default/admin/sanitycheck/messages.html.tmpl
@@ -15,8 +15,6 @@
  # Contributor(s): Frédéric Buclin <LpSolit@gmail.com>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% san_message = BLOCK %]
  [% IF san_tag == "checks_start" %]
    OK, now running sanity checks.

--- a/template/en/default/admin/sudo.html.tmpl
+++ b/template/en/default/admin/sudo.html.tmpl
@@ -17,8 +17,6 @@
  #
  # Contributor(s): A. Karl Kornel <karl@kornel.name>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS global/header.html.tmpl
   title = "Begin sudo session"

--- a/template/en/default/admin/versions/edit.html.tmpl
+++ b/template/en/default/admin/versions/edit.html.tmpl
@@ -25,8 +25,6 @@
  #                    version the user wants to edit.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% title = BLOCK %]Edit Version '[% version.name FILTER html %]' of product '
                   [%- product.name FILTER html %]'[% END %]
 [% PROCESS global/header.html.tmpl

--- a/template/en/default/admin/versions/list.html.tmpl
+++ b/template/en/default/admin/versions/list.html.tmpl
@@ -24,8 +24,6 @@
  #               which the versions belongs.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% title = BLOCK %]Select version of product
                   '[% product.name FILTER html %]'[% END %]
 [% PROCESS global/header.html.tmpl

--- a/template/en/default/admin/versions/select-product.html.tmpl
+++ b/template/en/default/admin/versions/select-product.html.tmpl
@@ -25,8 +25,6 @@
  # showbugcounts: if defined, then bug counts should be included in the table
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS global/header.html.tmpl
  title = "Edit versions for which product?"
 %]

--- a/template/en/default/attachment/choose.html.tmpl
+++ b/template/en/default/attachment/choose.html.tmpl
@@ -18,8 +18,6 @@
  # Contributor(s): Gavin Shelley <bugzilla@chimpychompy.org>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS global/header.html.tmpl
   title = "Locate attachment",
   onload = "document.forms['choose-id'].id.focus()"

--- a/template/en/default/attachment/confirm-delete.html.tmpl
+++ b/template/en/default/attachment/confirm-delete.html.tmpl
@@ -18,8 +18,6 @@
  # token: string; The token used to identify the session.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% title = BLOCK %]
  Delete Attachment [% a.id FILTER html %] of [% terms.Bug %] [%+ a.bug_id FILTER html %]
 [% END %]

--- a/template/en/default/attachment/created.html.tmpl
+++ b/template/en/default/attachment/created.html.tmpl
@@ -24,7 +24,6 @@
  #  Possible values: autodetect, list, manual.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% bug = bugs.0 %]
 [% PROCESS "bug/show-header.html.tmpl" %]
 [% PROCESS global/header.html.tmpl

--- a/template/en/default/attachment/diff-footer.html.tmpl
+++ b/template/en/default/attachment/diff-footer.html.tmpl
@@ -23,8 +23,6 @@
 [% IF headers %]
  <br>
-  [% PROCESS global/variables.none.tmpl %]
  <span>Return to [% "$terms.bug $bugid" FILTER bug_link(bugid) FILTER none %]</span>
  [% PROCESS global/footer.html.tmpl %]

--- a/template/en/default/attachment/diff-header.html.tmpl
+++ b/template/en/default/attachment/diff-header.html.tmpl
@@ -20,8 +20,6 @@
 [%# Define strings that will serve as the title and header of this page %]
-[% PROCESS global/variables.none.tmpl %]
 [% title = BLOCK %]
  [% IF attachid %]
 Attachment #[% attachid %] for [% terms.bug %] #[% bugid %]

--- a/template/en/default/attachment/edit.html.tmpl
+++ b/template/en/default/attachment/edit.html.tmpl
@@ -20,8 +20,6 @@
  #                 Guy Pyrzak <guy.pyrzak@gmail.com>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [%# Define strings that will serve as the title and header of this page %]
 [% title = BLOCK %]
  Attachment [% attachment.id %] Details for [% terms.Bug %] [%+ attachment.bug_id %]

--- a/template/en/default/attachment/midair.html.tmpl
+++ b/template/en/default/attachment/midair.html.tmpl
@@ -31,7 +31,6 @@
 [% USE Bugzilla %]
 [% cgi = Bugzilla.cgi %]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS global/header.html.tmpl title = "Mid-air collision!" %]
 <h1>Mid-air collision detected!</h1>

--- a/template/en/default/attachment/show-multiple.html.tmpl
+++ b/template/en/default/attachment/show-multiple.html.tmpl
@@ -18,7 +18,6 @@
  # Contributor(s): Myk Melez <myk@mozilla.org>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% filtered_summary = bugsummary FILTER html %]
 [% header = BLOCK %]View All Attachments for
  [%+ "$terms.Bug $bug.id" FILTER bug_link(bug) FILTER none %][% END %]

--- a/template/en/default/attachment/updated.html.tmpl
+++ b/template/en/default/attachment/updated.html.tmpl
@@ -23,7 +23,6 @@
  # attachment: object of the attachment we just attached.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% bug = bugs.0 %]
 [% PROCESS "bug/show-header.html.tmpl" %]

--- a/template/en/default/bug/activity/show.html.tmpl
+++ b/template/en/default/bug/activity/show.html.tmpl
@@ -26,8 +26,6 @@
  # activity/table.html.tmpl template fulfilled.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% filtered_desc = bug.short_desc FILTER html %]
 [% PROCESS global/header.html.tmpl
  title = "Changes made to $terms.bug $bug.bug_id"

--- a/template/en/default/bug/choose.html.tmpl
+++ b/template/en/default/bug/choose.html.tmpl
@@ -18,8 +18,6 @@
  # Contributor(s): Gervase Markham <gerv@gerv.net>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS global/header.html.tmpl
   title = "Search by $terms.bug number"
 %]

--- a/template/en/default/bug/create/created.html.tmpl
+++ b/template/en/default/bug/create/created.html.tmpl
@@ -28,8 +28,6 @@
  #     template bug/edit.html.tmpl
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS "bug/show-header.html.tmpl" %]
 [% PROCESS global/header.html.tmpl
  title = "$terms.Bug $id Submitted &ndash; $filtered_desc"

--- a/template/en/default/bug/create/make-template.html.tmpl
+++ b/template/en/default/bug/create/make-template.html.tmpl
@@ -24,8 +24,6 @@
  # short_desc: Bug summary as entered in the form.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS global/header.html.tmpl
  title = "Bookmarks are your friend"
  header = "Template constructed"

--- a/template/en/default/bug/create/user-message.html.tmpl
+++ b/template/en/default/bug/create/user-message.html.tmpl
@@ -27,8 +27,6 @@
  # the 'product' variable.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 Before reporting [% terms.abug %], please read the 
 <a href="page.cgi?id=bug-writing.html">
 [% terms.bug %] writing guidelines</a>, please look at the list of

--- a/template/en/default/bug/dependency-graph.html.tmpl
+++ b/template/en/default/bug/dependency-graph.html.tmpl
@@ -30,8 +30,6 @@
                       dependencies. (Optional)
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% title = "Dependency Graph"
   header = title
 %]

--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -24,8 +24,6 @@
  #                 Elliotte Martin <emartin@everythingsolved.com>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS "global/field-descs.none.tmpl" %]
 [% PROCESS bug/time.html.tmpl %]

--- a/template/en/default/bug/format_comment.txt.tmpl
+++ b/template/en/default/bug/format_comment.txt.tmpl
@@ -29,7 +29,6 @@
  #%]
 [%# Please don't use field-descs here. It can slow down Bugzilla. %]
-[% PROCESS 'global/variables.none.tmpl' %]
 [% SET comment_body = comment.body %]

--- a/template/en/default/bug/knob.html.tmpl
+++ b/template/en/default/bug/knob.html.tmpl
@@ -21,7 +21,6 @@
  #                 Guy Pyrzak <guy.pyrzak@gmail.com>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 <div id="status">
  [% PROCESS bug/field.html.tmpl
      no_tds = 1

--- a/template/en/default/bug/navigate.html.tmpl
+++ b/template/en/default/bug/navigate.html.tmpl
@@ -21,7 +21,6 @@
 [% RETURN IF !bug %]
-[% PROCESS global/variables.none.tmpl %]
 [% IF bottom_navigator == 1 %]
  <ul class="related_actions">
    <li><a href="show_bug.cgi?format=multiple&amp;id=

--- a/template/en/default/bug/process/bugmail.html.tmpl
+++ b/template/en/default/bug/process/bugmail.html.tmpl
@@ -24,8 +24,6 @@
  # sent_bugmail: The results of Bugzilla::BugMail::Send().
  #%]
-[% PROCESS global/variables.none.tmpl %]
 <dl>
 [% PROCESS emails
   description = "Email sent to"

--- a/template/en/default/bug/process/confirm-duplicate.html.tmpl
+++ b/template/en/default/bug/process/confirm-duplicate.html.tmpl
@@ -27,7 +27,6 @@
  #   of the original bug can access that bug.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS global/header.html.tmpl title="Duplicate Warning" %]
 [% orig_bug = "$terms.bug $original_bug_id"
     FILTER bug_link(original_bug_id) %]

--- a/template/en/default/bug/process/header.html.tmpl
+++ b/template/en/default/bug/process/header.html.tmpl
@@ -22,8 +22,6 @@
  # As global/header.html.tmpl.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% USE Bugzilla %]
 [% PROCESS "bug/show-header.html.tmpl" %]

--- a/template/en/default/bug/process/midair.html.tmpl
+++ b/template/en/default/bug/process/midair.html.tmpl
@@ -35,8 +35,6 @@
 [% USE Bugzilla %]
 [% cgi = Bugzilla.cgi %]
-[% PROCESS global/variables.none.tmpl %]
 [% UNLESS header_done %]
  [% PROCESS bug/process/header.html.tmpl %]
 [% END %]

--- a/template/en/default/bug/process/results.html.tmpl
+++ b/template/en/default/bug/process/results.html.tmpl
@@ -26,8 +26,6 @@
  #   and "dep" when a bug is checked for changes to its dependencies.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% UNLESS header_done %]
  [% PROCESS bug/process/header.html.tmpl %]
 [% END %]

--- a/template/en/default/bug/process/verify-new-product.html.tmpl
+++ b/template/en/default/bug/process/verify-new-product.html.tmpl
@@ -31,8 +31,6 @@
  # verify_bug_groups: If groups need to be confirmed in addition to fields.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS global/header.html.tmpl
  title = 'Verify New Product Details...' %]

--- a/template/en/default/bug/show.html.tmpl
+++ b/template/en/default/bug/show.html.tmpl
@@ -21,8 +21,6 @@
  #                 Max Kanat-Alexander <mkanat@bugzilla.org>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [%# This script/template only handles one bug #%]
 [% bug = bugs.0 %]

--- a/template/en/default/email/flagmail.txt.tmpl
+++ b/template/en/default/email/flagmail.txt.tmpl
@@ -20,8 +20,6 @@
  #                     Frédéric Buclin <LpSolit@gmail.com>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% bugidsummary = bug.bug_id _ ': ' _ bug.short_desc %]
 [% attidsummary = attachment.id _ ': ' _ attachment.description %]
 [% flagtype_name = flag ? flag.type.name : old_flag.type.name %]

--- a/template/en/default/email/lockout.txt.tmpl
+++ b/template/en/default/email/lockout.txt.tmpl
@@ -18,8 +18,6 @@
  #   Max Kanat-Alexander <mkanat@bugzilla.org>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 From: [% Param('mailfrom') %]
 To: [% Param('maintainer') %]
 Subject: [[% terms.Bugzilla %]] Account Lock-Out: [% locked_user.login %] ([% attempts.0.ip_addr %])

--- a/template/en/default/email/sanitycheck.txt.tmpl
+++ b/template/en/default/email/sanitycheck.txt.tmpl
@@ -18,7 +18,6 @@
  # Contributor(s): Frédéric Buclin <LpSolit@gmail.com>
  #%]
-[% PROCESS "global/variables.none.tmpl" %]
 From: [% Param('mailfrom') %]
 To: [% addressee %]
 Subject: [[% terms.Bugzilla %]] Sanity Check Results

--- a/template/en/default/email/sudo.txt.tmpl
+++ b/template/en/default/email/sudo.txt.tmpl
@@ -18,8 +18,6 @@
  # Contributor(s): A. Karl Kornel <karl@kornel.name>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 Content-Type: text/plain
 From: [% Param('mailfrom') %]
 To: [% user.email %]

--- a/template/en/default/extensions/config.pm.tmpl
+++ b/template/en/default/extensions/config.pm.tmpl
@@ -23,8 +23,6 @@
  # name: string; The name of the extension.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS extensions/license.txt.tmpl %]
 package B[% %]ugzilla::Extension::[% name %];

--- a/template/en/default/extensions/extension.pm.tmpl
+++ b/template/en/default/extensions/extension.pm.tmpl
@@ -23,8 +23,6 @@
  # name: string; The name of the extension.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS extensions/license.txt.tmpl %]
 package B[% %]ugzilla::Extension::[% name %];

--- a/template/en/default/extensions/hook-readme.txt.tmpl
+++ b/template/en/default/extensions/hook-readme.txt.tmpl
@@ -18,8 +18,6 @@
  #   Max Kanat-Alexander <mkanat@bugzilla.org>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 Template hooks go in this directory. Template hooks are called in normal
 [%+ terms.Bugzilla %] templates like [[% '%' %] Hook.process('some-hook') %].
 More information about them can be found in the documentation of 

--- a/template/en/default/extensions/license.txt.tmpl
+++ b/template/en/default/extensions/license.txt.tmpl
@@ -23,8 +23,6 @@
  # name: string; The name of the extension.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 # -*- Mode: perl; indent-tabs-mode: nil -*-
 #
 # The contents of this file are subject to the Mozilla Public

--- a/template/en/default/extensions/name-readme.txt.tmpl
+++ b/template/en/default/extensions/name-readme.txt.tmpl
@@ -18,8 +18,6 @@
  #   Max Kanat-Alexander <mkanat@bugzilla.org>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 Normal templates go in this directory. You can load them in your
 code like this:

--- a/template/en/default/extensions/util.pm.tmpl
+++ b/template/en/default/extensions/util.pm.tmpl
@@ -23,8 +23,6 @@
  # name: string; The name of the extension.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS extensions/license.txt.tmpl %]
 package B[% %]ugzilla::Extension::[% name %]::Util;

--- a/template/en/default/extensions/web-readme.txt.tmpl
+++ b/template/en/default/extensions/web-readme.txt.tmpl
@@ -18,8 +18,6 @@
  #   Max Kanat-Alexander <mkanat@bugzilla.org>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 Web-accessible files, like JavaScript, CSS, and images go in this
 directory. You can reference them directly in your HTML. For example,
 if you have a file called "style.css" and your extension is called

--- a/template/en/default/global/choose-product.html.tmpl
+++ b/template/en/default/global/choose-product.html.tmpl
@@ -27,8 +27,6 @@
  # format:   the desired format to display the target.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% IF target == "enter_bug.cgi" %]
  [% title = "Enter $terms.Bug" %]
  [% h2 = BLOCK %]First, you must pick a product on which to enter [% terms.abug %]: [% END %]

--- a/template/en/default/global/field-descs.none.tmpl
+++ b/template/en/default/global/field-descs.none.tmpl
@@ -21,8 +21,6 @@
 [%# Remember to PROCESS rather than INCLUDE this template. %]
-[% PROCESS global/variables.none.tmpl %]
 [% SET search_descs = {
  "noop"           => "---",
  "equals"         => "is equal to",

--- a/template/en/default/global/initialize.none.tmpl
+++ b/template/en/default/global/initialize.none.tmpl
-[%# The contents of this file are subject to the Mozilla Public
-  # License Version 1.1 (the "License"); you may not use this file
-  # except in compliance with the License. You may obtain a copy of
-  # the License at http://www.mozilla.org/MPL/
-  #
-  # Software distributed under the License is distributed on an "AS
-  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-  # implied. See the License for the specific language governing
-  # rights and limitations under the License.
-  #
-  # The Original Code is the Bugzilla Bug Tracking System.
-  #
-  # The Initial Developer of the Original Code is Netscape Communications
-  # Corporation. Portions created by Netscape are
-  # Copyright (C) 1998 Netscape Communications Corporation. All
-  # Rights Reserved.
-  #
-  # Contributor(s): Myk Melez <myk@mozilla.org>
-  #%]
-[%# This template is a place to put directives that should get processed
-  # every time a primary template gets processed.  Primary templates are those
-  # called from Perl code rather than from other templates via the PROCESS
-  # and INCLUDE directives.
-  #
-  # This template gets auto-processed at the beginning of primary templates
-  # via the PRE_PROCESS configuration parameter.  Note that it gets processed
-  # for non-HTML templates too, so don't put HTML-specific stuff in here;
-  # put that into header.html.tmpl instead.
-  #%]
-[% USE Hook %]
--- a/template/en/default/global/message.html.tmpl
+++ b/template/en/default/global/message.html.tmpl
@@ -23,8 +23,6 @@
  # link: string. The link text for that URL.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% DEFAULT title = "$terms.Bugzilla Message" %]
 [% PROCESS global/header.html.tmpl %]

--- a/template/en/default/global/message.txt.tmpl
+++ b/template/en/default/global/message.txt.tmpl
@@ -17,8 +17,6 @@
  # Contributor(s): Max Kanat-Alexander <mkanat@bugzilla.org>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [%# Yes, this may show some HTML. But it's the best we
  # can do at the moment. %]
 [% PROCESS global/messages.html.tmpl %]

--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -23,8 +23,6 @@
  # alphabetical order by message tag, and leave a blank line between messages.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS "global/field-descs.none.tmpl" %]
 [% message_tag = message %]

--- a/template/en/default/global/setting-descs.none.tmpl
+++ b/template/en/default/global/setting-descs.none.tmpl
@@ -16,8 +16,6 @@
 [%# Remember to PROCESS rather than INCLUDE this template. %]
-[% PROCESS global/variables.none.tmpl %]
 [% setting_descs = { 
   "comment_sort_order"               => "When viewing $terms.abug, show comments in this order",
   "csv_colsepchar"                   => "Field separator character for CSV files",

--- a/template/en/default/global/site-navigation.html.tmpl
+++ b/template/en/default/global/site-navigation.html.tmpl
@@ -23,8 +23,6 @@
  # bug.bug_id: integer. Number of current bug (for navigation purposes)
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% USE Bugzilla %]
 [% cgi = Bugzilla.cgi %]

--- a/template/en/default/global/useful-links.html.tmpl
+++ b/template/en/default/global/useful-links.html.tmpl
@@ -23,8 +23,6 @@
 [%# Migration note: this whole file corresponds to the old %commandmenu% 
    substitution param in 'footerhtml' %]
-[% PROCESS global/variables.none.tmpl %]
 <ul id="useful-links">
  <li id="links-actions">
      [% PROCESS "global/common-links.html.tmpl" qs_suffix = "_bottom" %]

--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -39,8 +39,6 @@
  # nobody can guarantee the hook files processing order in the future.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS "global/field-descs.none.tmpl" %]
 [% DEFAULT title = "Error" %]

--- a/template/en/default/global/variables.none.tmpl
+++ b/template/en/default/global/variables.none.tmpl
@@ -41,4 +41,5 @@
  }
 %]
+[% USE Hook %]
 [% Hook.process("end") %]
--- a/template/en/default/index.html.tmpl
+++ b/template/en/default/index.html.tmpl
@@ -26,9 +26,6 @@
  # release: a hash containing data about new releases, if any.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS global/header.html.tmpl
   title = "$terms.Bugzilla Main Page"
   header = "Main Page" 

--- a/template/en/default/list/change-columns.html.tmpl
+++ b/template/en/default/list/change-columns.html.tmpl
@@ -19,8 +19,6 @@
  #                 Pascal Held <paheld@gmail.com>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS global/header.html.tmpl
  title = "Change Columns"
  javascript_urls = "js/change-columns.js"

--- a/template/en/default/list/list-simple.html.tmpl
+++ b/template/en/default/list/list-simple.html.tmpl
@@ -22,18 +22,8 @@
  # title: string. The title for this page. (optional)
  #%]
-[% PROCESS global/variables.none.tmpl %]
-[%############################################################################%]
-[%# Initialization                                                           #%]
-[%############################################################################%]
 [% DEFAULT title = "$terms.Bug List" %]
-[%############################################################################%]
-[%# Bug Table                                                                #%]
-[%############################################################################%]
 <html>
  <head>

--- a/template/en/default/list/list.ics.tmpl
+++ b/template/en/default/list/list.ics.tmpl
@@ -17,7 +17,6 @@
  #
  # Contributor(s): William Jon McCann <mccann@jhu.edu>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 BEGIN:VCALENDAR
 CALSCALE:GREGORIAN
 [%+ PROCESS ics_prodid +%]

--- a/template/en/default/list/quips.html.tmpl
+++ b/template/en/default/list/quips.html.tmpl
@@ -26,8 +26,6 @@
  #                List of all quips.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% PROCESS global/header.html.tmpl
           title = "$terms.Bugzilla Quip System"
           header = "Add your own clever headline"

--- a/template/en/default/list/server-push.html.tmpl
+++ b/template/en/default/list/server-push.html.tmpl
@@ -23,8 +23,6 @@
  # query: string. The SQL query which makes the buglist.
  #%]
-[% PROCESS global/variables.none.tmpl %]
 <html>
  <head>
    <title>[% terms.Bugzilla %] is pondering your search</title>

--- a/template/en/default/pages/linkify.html.tmpl
+++ b/template/en/default/pages/linkify.html.tmpl
@@ -19,7 +19,6 @@
  #                 Gervase Markham <gerv@gerv.net>
  #%]
-[% PROCESS global/variables.none.tmpl %]
 [% INCLUDE global/header.html.tmpl title = "Linkify Text" %]
 <p>

--- a/template/en/default/pages/release-notes.html.tmpl
+++ b/template/en/default/pages/release-notes.html.tmpl
--- a/template/en/default/pages/sudo.html.tmpl
+++ b/template/en/default/pages/sudo.html.tmpl
--- a/template/en/default/reports/duplicates-simple.html.tmpl
+++ b/template/en/default/reports/duplicates-simple.html.tmpl
--- a/template/en/default/reports/duplicates.html.tmpl
+++ b/template/en/default/reports/duplicates.html.tmpl
--- a/template/en/default/reports/keywords.html.tmpl
+++ b/template/en/default/reports/keywords.html.tmpl
--- a/template/en/default/reports/menu.html.tmpl
+++ b/template/en/default/reports/menu.html.tmpl
--- a/template/en/default/reports/report-bar.png.tmpl
+++ b/template/en/default/reports/report-bar.png.tmpl
--- a/template/en/default/reports/report-line.png.tmpl
+++ b/template/en/default/reports/report-line.png.tmpl
--- a/template/en/default/reports/report-simple.html.tmpl
+++ b/template/en/default/reports/report-simple.html.tmpl
--- a/template/en/default/reports/report-table.csv.tmpl
+++ b/template/en/default/reports/report-table.csv.tmpl
--- a/template/en/default/request/queue.html.tmpl
+++ b/template/en/default/request/queue.html.tmpl
--- a/template/en/default/search/knob.html.tmpl
+++ b/template/en/default/search/knob.html.tmpl
--- a/template/en/default/search/search-advanced.html.tmpl
+++ b/template/en/default/search/search-advanced.html.tmpl
--- a/template/en/default/search/search-create-series.html.tmpl
+++ b/template/en/default/search/search-create-series.html.tmpl
--- a/template/en/default/search/search-plugin.xml.tmpl
+++ b/template/en/default/search/search-plugin.xml.tmpl
--- a/template/en/default/search/search-report-graph.html.tmpl
+++ b/template/en/default/search/search-report-graph.html.tmpl
--- a/template/en/default/search/search-report-table.html.tmpl
+++ b/template/en/default/search/search-report-table.html.tmpl
--- a/template/en/default/search/search-specific.html.tmpl
+++ b/template/en/default/search/search-specific.html.tmpl
--- a/template/en/default/welcome-admin.html.tmpl
+++ b/template/en/default/welcome-admin.html.tmpl
--- a/template/en/default/whine/mail.html.tmpl
+++ b/template/en/default/whine/mail.html.tmpl
--- a/template/en/default/whine/multipart-mime.txt.tmpl
+++ b/template/en/default/whine/multipart-mime.txt.tmpl
--- a/template/en/default/whine/schedule.html.tmpl
+++ b/template/en/default/whine/schedule.html.tmpl