diff options
122 files changed, 3 insertions, 262 deletions
diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm index 527b704b2..aba584e91 100644 --- 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, diff --git a/extensions/Voting/template/en/default/pages/voting.html.tmpl b/extensions/Voting/template/en/default/pages/voting.html.tmpl index 99026c0d5..44e9e9a60 100644 --- 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 diff --git a/extensions/Voting/template/en/default/pages/voting/bug.html.tmpl b/extensions/Voting/template/en/default/pages/voting/bug.html.tmpl index 4c69a45f6..b93ebc541 100644 --- 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 %] diff --git a/extensions/Voting/template/en/default/pages/voting/user.html.tmpl b/extensions/Voting/template/en/default/pages/voting/user.html.tmpl index 61eaf8491..3c4aab1f9 100644 --- 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 %] diff --git a/extensions/Voting/template/en/default/voting/delete-all.html.tmpl b/extensions/Voting/template/en/default/voting/delete-all.html.tmpl index f0d3b7e13..15c3ce4cd 100644 --- 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?" %] diff --git a/extensions/Voting/template/en/default/voting/votes-removed.txt.tmpl b/extensions/Voting/template/en/default/voting/votes-removed.txt.tmpl index bfb37c90d..6bfbf2325 100644 --- 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. diff --git a/t/004template.t b/t/004template.t index 3b858c0b3..a3c2fc5de 100644 --- 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 => { diff --git a/template/en/default/account/auth/login-small.html.tmpl b/template/en/default/account/auth/login-small.html.tmpl index 39984aeaf..3d986010c 100644 --- 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. %] diff --git a/template/en/default/account/auth/login.html.tmpl b/template/en/default/account/auth/login.html.tmpl index 80dd12153..469d29db1 100644 --- 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", diff --git a/template/en/default/account/cancel-token.txt.tmpl b/template/en/default/account/cancel-token.txt.tmpl index 6619dedd3..51c3d4291 100644 --- 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 %] diff --git a/template/en/default/account/create.html.tmpl b/template/en/default/account/create.html.tmpl index 5b8220193..bf273e459 100644 --- 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 %] diff --git a/template/en/default/account/created.html.tmpl b/template/en/default/account/created.html.tmpl index d794198bc..71be8870e 100644 --- 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 %] diff --git a/template/en/default/account/email/change-new.txt.tmpl b/template/en/default/account/email/change-new.txt.tmpl index b40ab9852..2d9301f1f 100644 --- 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 diff --git a/template/en/default/account/email/change-old.txt.tmpl b/template/en/default/account/email/change-old.txt.tmpl index ee66c0f24..9446ee59f 100644 --- 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 diff --git a/template/en/default/account/email/request-new.txt.tmpl b/template/en/default/account/email/request-new.txt.tmpl index 8fb36926f..c2fe7b70e 100644 --- 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 diff --git a/template/en/default/account/password/forgotten-password.txt.tmpl b/template/en/default/account/password/forgotten-password.txt.tmpl index e014658dc..b4eea4875 100644 --- 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 diff --git a/template/en/default/account/prefs/email.html.tmpl b/template/en/default/account/prefs/email.html.tmpl index 96a111bae..6a09b20a2 100644 --- 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 diff --git a/template/en/default/account/prefs/permissions.html.tmpl b/template/en/default/account/prefs/permissions.html.tmpl index 5e8dc9ca2..981e1bd82 100644 --- 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> diff --git a/template/en/default/admin/admin.html.tmpl b/template/en/default/admin/admin.html.tmpl index 98f729b02..c4d49fd8d 100644 --- 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 %]) diff --git a/template/en/default/admin/classifications/footer.html.tmpl b/template/en/default/admin/classifications/footer.html.tmpl index db983aa74..9d3f4a57e 100644 --- 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> diff --git a/template/en/default/admin/components/edit.html.tmpl b/template/en/default/admin/components/edit.html.tmpl index 5236186cc..7a2025045 100644 --- 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 %] diff --git a/template/en/default/admin/components/list.html.tmpl b/template/en/default/admin/components/list.html.tmpl index b45b97565..665f876ee 100644 --- 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 diff --git a/template/en/default/admin/components/select-product.html.tmpl b/template/en/default/admin/components/select-product.html.tmpl index 0910f9802..5f173b8f2 100644 --- 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?" %] diff --git a/template/en/default/admin/fieldvalues/edit.html.tmpl b/template/en/default/admin/fieldvalues/edit.html.tmpl index 9c42ce639..65f5bf728 100644 --- 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 diff --git a/template/en/default/admin/fieldvalues/list.html.tmpl b/template/en/default/admin/fieldvalues/list.html.tmpl index 2b6aedb6f..660f9182c 100644 --- 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 diff --git a/template/en/default/admin/fieldvalues/select-field.html.tmpl b/template/en/default/admin/fieldvalues/select-field.html.tmpl index 3704d42aa..ed2ff01d9 100644 --- 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?" %] diff --git a/template/en/default/admin/flag-type/confirm-delete.html.tmpl b/template/en/default/admin/flag-type/confirm-delete.html.tmpl index ed909417d..9fc6dcaa0 100644 --- 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 diff --git a/template/en/default/admin/flag-type/edit.html.tmpl b/template/en/default/admin/flag-type/edit.html.tmpl index 2cb985a47..eb713d978 100644 --- 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" %] diff --git a/template/en/default/admin/flag-type/list.html.tmpl b/template/en/default/admin/flag-type/list.html.tmpl index 220db8900..5b33308e2 100644 --- 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 diff --git a/template/en/default/admin/keywords/edit.html.tmpl b/template/en/default/admin/keywords/edit.html.tmpl index 65a62290b..b1b91f963 100644 --- 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" %] diff --git a/template/en/default/admin/keywords/list.html.tmpl b/template/en/default/admin/keywords/list.html.tmpl index c400a2362..50945ee67 100644 --- 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" %] diff --git a/template/en/default/admin/milestones/edit.html.tmpl b/template/en/default/admin/milestones/edit.html.tmpl index ef4b7fcc4..e9eefdec9 100644 --- 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 diff --git a/template/en/default/admin/milestones/list.html.tmpl b/template/en/default/admin/milestones/list.html.tmpl index 6392f567f..b89b6920f 100644 --- 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 diff --git a/template/en/default/admin/milestones/select-product.html.tmpl b/template/en/default/admin/milestones/select-product.html.tmpl index 587db6d65..60b7c35ce 100644 --- 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?" %] diff --git a/template/en/default/admin/params/editparams.html.tmpl b/template/en/default/admin/params/editparams.html.tmpl index fd38d65f0..7471f148f 100644 --- 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') %] diff --git a/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl b/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl index 1fc92c928..f363fa9da 100644 --- 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 %] diff --git a/template/en/default/admin/products/groupcontrol/edit.html.tmpl b/template/en/default/admin/products/groupcontrol/edit.html.tmpl index 8c634ebfe..12b504361 100644 --- 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 %] diff --git a/template/en/default/admin/products/list-classifications.html.tmpl b/template/en/default/admin/products/list-classifications.html.tmpl index 161cc4b5b..cf69c6772 100644 --- 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" %] diff --git a/template/en/default/admin/products/list.html.tmpl b/template/en/default/admin/products/list.html.tmpl index 0641c6283..eb875003f 100644 --- 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 %]&classification= [%- classification.name FILTER uri %] diff --git a/template/en/default/admin/sanitycheck/list.html.tmpl b/template/en/default/admin/sanitycheck/list.html.tmpl index 464297262..357349d76 100644 --- 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'] %] diff --git a/template/en/default/admin/sanitycheck/messages.html.tmpl b/template/en/default/admin/sanitycheck/messages.html.tmpl index 494a8cdf0..140358d7e 100644 --- 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. diff --git a/template/en/default/admin/sudo.html.tmpl b/template/en/default/admin/sudo.html.tmpl index 676959c34..6d0ab9b39 100644 --- 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" diff --git a/template/en/default/admin/versions/edit.html.tmpl b/template/en/default/admin/versions/edit.html.tmpl index 497d67e2e..95b840877 100644 --- 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 diff --git a/template/en/default/admin/versions/list.html.tmpl b/template/en/default/admin/versions/list.html.tmpl index 69435d220..a96875597 100644 --- 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 diff --git a/template/en/default/admin/versions/select-product.html.tmpl b/template/en/default/admin/versions/select-product.html.tmpl index 7fded475e..d92d47b1a 100644 --- 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?" %] diff --git a/template/en/default/attachment/choose.html.tmpl b/template/en/default/attachment/choose.html.tmpl index 700abb4e8..ac061135c 100644 --- 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()" diff --git a/template/en/default/attachment/confirm-delete.html.tmpl b/template/en/default/attachment/confirm-delete.html.tmpl index 14c76c309..5d47effab 100644 --- 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 %] diff --git a/template/en/default/attachment/created.html.tmpl b/template/en/default/attachment/created.html.tmpl index da2fec823..a57c2fbf2 100644 --- 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 diff --git a/template/en/default/attachment/diff-footer.html.tmpl b/template/en/default/attachment/diff-footer.html.tmpl index 49c662a98..db13b6822 100644 --- 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 %] diff --git a/template/en/default/attachment/diff-header.html.tmpl b/template/en/default/attachment/diff-header.html.tmpl index c13b2e7ba..763629a68 100644 --- 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 %] diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl index fbe3a9c79..a078141a2 100644 --- 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 %] diff --git a/template/en/default/attachment/midair.html.tmpl b/template/en/default/attachment/midair.html.tmpl index f7f40fdcb..d580e95ea 100644 --- 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> diff --git a/template/en/default/attachment/show-multiple.html.tmpl b/template/en/default/attachment/show-multiple.html.tmpl index e238e5f49..175e203d7 100644 --- 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 %] diff --git a/template/en/default/attachment/updated.html.tmpl b/template/en/default/attachment/updated.html.tmpl index 9a74f5c98..dc23b34bb 100644 --- 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" %] diff --git a/template/en/default/bug/activity/show.html.tmpl b/template/en/default/bug/activity/show.html.tmpl index 67ac689ca..2fe15289f 100644 --- 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" diff --git a/template/en/default/bug/choose.html.tmpl b/template/en/default/bug/choose.html.tmpl index 9009d3873..2b5b2ba2b 100644 --- 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" %] diff --git a/template/en/default/bug/create/created.html.tmpl b/template/en/default/bug/create/created.html.tmpl index d9eaccbbf..dbd81714f 100644 --- 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 – $filtered_desc" diff --git a/template/en/default/bug/create/make-template.html.tmpl b/template/en/default/bug/create/make-template.html.tmpl index 13974833a..869233f7d 100644 --- 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" diff --git a/template/en/default/bug/create/user-message.html.tmpl b/template/en/default/bug/create/user-message.html.tmpl index ac2cc29df..b48c09b72 100644 --- 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 diff --git a/template/en/default/bug/dependency-graph.html.tmpl b/template/en/default/bug/dependency-graph.html.tmpl index 78fc4a8aa..aa42d06b3 100644 --- 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 %] diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 99b231c8e..75c263e68 100644 --- 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 %] diff --git a/template/en/default/bug/format_comment.txt.tmpl b/template/en/default/bug/format_comment.txt.tmpl index 156798026..4c9cbee3f 100644 --- 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 %] diff --git a/template/en/default/bug/knob.html.tmpl b/template/en/default/bug/knob.html.tmpl index ac14e6dc0..8b3636f9e 100644 --- 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 diff --git a/template/en/default/bug/navigate.html.tmpl b/template/en/default/bug/navigate.html.tmpl index 46b92aec4..f76bac023 100644 --- 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&id= diff --git a/template/en/default/bug/process/bugmail.html.tmpl b/template/en/default/bug/process/bugmail.html.tmpl index b0132a2fe..f11abdde8 100644 --- 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" diff --git a/template/en/default/bug/process/confirm-duplicate.html.tmpl b/template/en/default/bug/process/confirm-duplicate.html.tmpl index d89c8da23..d93632198 100644 --- 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) %] diff --git a/template/en/default/bug/process/header.html.tmpl b/template/en/default/bug/process/header.html.tmpl index 6b608b9ed..e787951b5 100644 --- 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" %] diff --git a/template/en/default/bug/process/midair.html.tmpl b/template/en/default/bug/process/midair.html.tmpl index 157cb44b4..4f7da2dcf 100644 --- 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 %] diff --git a/template/en/default/bug/process/results.html.tmpl b/template/en/default/bug/process/results.html.tmpl index c62a7a597..04191c254 100644 --- 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 %] diff --git a/template/en/default/bug/process/verify-new-product.html.tmpl b/template/en/default/bug/process/verify-new-product.html.tmpl index c02c26470..6849da585 100644 --- 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...' %] diff --git a/template/en/default/bug/show.html.tmpl b/template/en/default/bug/show.html.tmpl index 8d8e63a20..cd10a9f87 100644 --- 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 %] diff --git a/template/en/default/email/flagmail.txt.tmpl b/template/en/default/email/flagmail.txt.tmpl index fb957484b..6b647fe0a 100644 --- 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 %] diff --git a/template/en/default/email/lockout.txt.tmpl b/template/en/default/email/lockout.txt.tmpl index ac6525779..86c5df1a4 100644 --- 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 %]) diff --git a/template/en/default/email/sanitycheck.txt.tmpl b/template/en/default/email/sanitycheck.txt.tmpl index 8826d4e39..f0ebbb72d 100644 --- 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 diff --git a/template/en/default/email/sudo.txt.tmpl b/template/en/default/email/sudo.txt.tmpl index 74fbc4976..a11ed8bc8 100644 --- 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 %] diff --git a/template/en/default/extensions/config.pm.tmpl b/template/en/default/extensions/config.pm.tmpl index 6997ec178..27955c88a 100644 --- 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 %]; diff --git a/template/en/default/extensions/extension.pm.tmpl b/template/en/default/extensions/extension.pm.tmpl index 249227103..81b36da67 100644 --- 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 %]; diff --git a/template/en/default/extensions/hook-readme.txt.tmpl b/template/en/default/extensions/hook-readme.txt.tmpl index efceec136..6b066da04 100644 --- 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 diff --git a/template/en/default/extensions/license.txt.tmpl b/template/en/default/extensions/license.txt.tmpl index 964e07505..36a4d2b1e 100644 --- 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 diff --git a/template/en/default/extensions/name-readme.txt.tmpl b/template/en/default/extensions/name-readme.txt.tmpl index 6d25c839e..a585963b8 100644 --- 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: diff --git a/template/en/default/extensions/util.pm.tmpl b/template/en/default/extensions/util.pm.tmpl index 32076a665..04d2bdf7b 100644 --- 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; diff --git a/template/en/default/extensions/web-readme.txt.tmpl b/template/en/default/extensions/web-readme.txt.tmpl index 55e593914..9895b42f6 100644 --- 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 diff --git a/template/en/default/global/choose-product.html.tmpl b/template/en/default/global/choose-product.html.tmpl index ae00bf503..0f5a54dff 100644 --- 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 %] diff --git a/template/en/default/global/field-descs.none.tmpl b/template/en/default/global/field-descs.none.tmpl index 21f41c86c..58fa688e6 100644 --- 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", diff --git a/template/en/default/global/initialize.none.tmpl b/template/en/default/global/initialize.none.tmpl deleted file mode 100644 index a6c48973c..000000000 --- a/template/en/default/global/initialize.none.tmpl +++ /dev/null @@ -1,32 +0,0 @@ -[%# 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 %] diff --git a/template/en/default/global/message.html.tmpl b/template/en/default/global/message.html.tmpl index e578a7f1b..60e752f54 100644 --- 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 %] diff --git a/template/en/default/global/message.txt.tmpl b/template/en/default/global/message.txt.tmpl index 9329cdbbf..318cec4f5 100644 --- 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 %] diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl index a57449d7c..f75bc4eb9 100644 --- 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 %] diff --git a/template/en/default/global/setting-descs.none.tmpl b/template/en/default/global/setting-descs.none.tmpl index a0b11f048..724e63206 100644 --- 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", diff --git a/template/en/default/global/site-navigation.html.tmpl b/template/en/default/global/site-navigation.html.tmpl index 06b0eaa92..00bf24a69 100644 --- 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 %] diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl index dd4fed424..bad0971cd 100644 --- 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" %] diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index d36f27d91..6918ea39e 100644 --- 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" %] diff --git a/template/en/default/global/variables.none.tmpl b/template/en/default/global/variables.none.tmpl index faf1a5427..f674de34d 100644 --- 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") %] diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index b1370261f..0fbee755d 100644 --- 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" diff --git a/template/en/default/list/change-columns.html.tmpl b/template/en/default/list/change-columns.html.tmpl index b13055c38..aa85baf6c 100644 --- 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" diff --git a/template/en/default/list/list-simple.html.tmpl b/template/en/default/list/list-simple.html.tmpl index f4c3549ed..cbe208540 100644 --- 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> diff --git a/template/en/default/list/list.ics.tmpl b/template/en/default/list/list.ics.tmpl index 54e8d0618..78a97ce9f 100644 --- 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 +%] diff --git a/template/en/default/list/quips.html.tmpl b/template/en/default/list/quips.html.tmpl index 512add995..4e30a16cd 100644 --- 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" diff --git a/template/en/default/list/server-push.html.tmpl b/template/en/default/list/server-push.html.tmpl index d1c157f72..505031228 100644 --- 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> diff --git a/template/en/default/pages/linkify.html.tmpl b/template/en/default/pages/linkify.html.tmpl index b936e8645..9120cac4e 100644 --- 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> diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl index 54a3c37b2..8d6a1666f 100644 --- a/template/en/default/pages/release-notes.html.tmpl +++ b/template/en/default/pages/release-notes.html.tmpl @@ -17,7 +17,6 @@ # Contributor(s): Max Kanat-Alexander <mkanat@bugzilla.org> #%] -[% PROCESS global/variables.none.tmpl %] [% SET title = "$terms.Bugzilla 4.0 Release Notes" %] [% INCLUDE global/header.html.tmpl title = title diff --git a/template/en/default/pages/sudo.html.tmpl b/template/en/default/pages/sudo.html.tmpl index c790ff1ab..08cf2e6db 100644 --- a/template/en/default/pages/sudo.html.tmpl +++ b/template/en/default/pages/sudo.html.tmpl @@ -18,7 +18,6 @@ # Contributor(s): A. Karl Kornel <karl@kornel.name> #%] -[% PROCESS global/variables.none.tmpl %] [% INCLUDE global/header.html.tmpl title = "sudo: User Impersonation" %] <p> diff --git a/template/en/default/reports/duplicates-simple.html.tmpl b/template/en/default/reports/duplicates-simple.html.tmpl index a08522790..2d7716d76 100644 --- a/template/en/default/reports/duplicates-simple.html.tmpl +++ b/template/en/default/reports/duplicates-simple.html.tmpl @@ -24,8 +24,6 @@ # You need to fulfill the interface to duplicates-table.html.tmpl. #%] -[% PROCESS global/variables.none.tmpl %] - <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> diff --git a/template/en/default/reports/duplicates.html.tmpl b/template/en/default/reports/duplicates.html.tmpl index ff1c271fe..53793009e 100644 --- a/template/en/default/reports/duplicates.html.tmpl +++ b/template/en/default/reports/duplicates.html.tmpl @@ -30,8 +30,6 @@ # duplicates-table.html.tmpl. #%] -[% PROCESS global/variables.none.tmpl %] - [% IF product.size %] [% title = BLOCK %] Most Frequently Reported [% terms.Bugs %] for diff --git a/template/en/default/reports/keywords.html.tmpl b/template/en/default/reports/keywords.html.tmpl index 045c6ebeb..cbf1cb505 100644 --- a/template/en/default/reports/keywords.html.tmpl +++ b/template/en/default/reports/keywords.html.tmpl @@ -28,8 +28,6 @@ # caneditkeywords: boolean. True if this user can edit keywords %] -[% PROCESS global/variables.none.tmpl %] - [% PROCESS global/header.html.tmpl title = "$terms.Bugzilla Keyword Descriptions" %] diff --git a/template/en/default/reports/menu.html.tmpl b/template/en/default/reports/menu.html.tmpl index 5e19b1209..579890d11 100644 --- a/template/en/default/reports/menu.html.tmpl +++ b/template/en/default/reports/menu.html.tmpl @@ -23,8 +23,6 @@ # types in Bugzilla. #%] -[% PROCESS global/variables.none.tmpl %] - [% PROCESS global/header.html.tmpl title = "Reporting and Charting Kitchen" doc_section = "reporting.html" diff --git a/template/en/default/reports/report-bar.png.tmpl b/template/en/default/reports/report-bar.png.tmpl index 649fba426..4c06a4094 100644 --- a/template/en/default/reports/report-bar.png.tmpl +++ b/template/en/default/reports/report-bar.png.tmpl @@ -18,8 +18,6 @@ # Contributor(s): Gervase Markham <gerv@gerv.net> #%] -[% PROCESS global/variables.none.tmpl %] - [% y_label = "$terms.Bugs" %] [% PROCESS "global/field-descs.none.tmpl" %] diff --git a/template/en/default/reports/report-line.png.tmpl b/template/en/default/reports/report-line.png.tmpl index 0edc0fee7..211732b84 100644 --- a/template/en/default/reports/report-line.png.tmpl +++ b/template/en/default/reports/report-line.png.tmpl @@ -18,8 +18,6 @@ # Contributor(s): Gervase Markham <gerv@gerv.net> #%] -[% PROCESS global/variables.none.tmpl %] - [% y_label = "$terms.Bugs" %] [% PROCESS "global/field-descs.none.tmpl" %] diff --git a/template/en/default/reports/report-simple.html.tmpl b/template/en/default/reports/report-simple.html.tmpl index d358109f7..bdded75e1 100644 --- a/template/en/default/reports/report-simple.html.tmpl +++ b/template/en/default/reports/report-simple.html.tmpl @@ -17,8 +17,6 @@ # You need to fulfill the interface to report-table.html.tmpl. #%] -[% PROCESS global/variables.none.tmpl %] - <html> [% title = "$terms.Bug List" %] diff --git a/template/en/default/reports/report-table.csv.tmpl b/template/en/default/reports/report-table.csv.tmpl index 4d8b50a85..0724f9cc9 100644 --- a/template/en/default/reports/report-table.csv.tmpl +++ b/template/en/default/reports/report-table.csv.tmpl @@ -20,7 +20,6 @@ [%# INTERFACE: # See report-table.html.tmpl. #%] -[% PROCESS global/variables.none.tmpl %] [% colsepchar = user.settings.csv_colsepchar.value %] diff --git a/template/en/default/request/queue.html.tmpl b/template/en/default/request/queue.html.tmpl index d99dadc9b..06cebdc75 100644 --- a/template/en/default/request/queue.html.tmpl +++ b/template/en/default/request/queue.html.tmpl @@ -18,8 +18,6 @@ # Contributor(s): Myk Melez <myk@mozilla.org> #%] -[% PROCESS global/variables.none.tmpl %] - [% USE Bugzilla %] [% cgi = Bugzilla.cgi %] diff --git a/template/en/default/search/knob.html.tmpl b/template/en/default/search/knob.html.tmpl index 17ff63a10..52b391ed6 100644 --- a/template/en/default/search/knob.html.tmpl +++ b/template/en/default/search/knob.html.tmpl @@ -27,9 +27,6 @@ # edited. This value is just passed through in a # hidden field. #%] - - -[% PROCESS global/variables.none.tmpl %] [%# This is not necessary for English templates, but useful for localizers. %] [% ordersdesc = { diff --git a/template/en/default/search/search-advanced.html.tmpl b/template/en/default/search/search-advanced.html.tmpl index 4f6f37bf2..a006d93c5 100644 --- a/template/en/default/search/search-advanced.html.tmpl +++ b/template/en/default/search/search-advanced.html.tmpl @@ -24,8 +24,6 @@ # search/boolean-charts.html.tmpl. #%] -[% PROCESS global/variables.none.tmpl %] - [% USE Bugzilla %] [% cgi = Bugzilla.cgi %] diff --git a/template/en/default/search/search-create-series.html.tmpl b/template/en/default/search/search-create-series.html.tmpl index 6863eba10..8e7e5545c 100644 --- a/template/en/default/search/search-create-series.html.tmpl +++ b/template/en/default/search/search-create-series.html.tmpl @@ -24,8 +24,6 @@ # search/boolean-charts.html.tmpl. #%] -[% PROCESS global/variables.none.tmpl %] - [% js_data = BLOCK %] var queryform = "chartform"; [% END %] diff --git a/template/en/default/search/search-plugin.xml.tmpl b/template/en/default/search/search-plugin.xml.tmpl index 8564dca47..5f370f312 100644 --- a/template/en/default/search/search-plugin.xml.tmpl +++ b/template/en/default/search/search-plugin.xml.tmpl @@ -13,7 +13,6 @@ # Contributor(s): Frédéric Buclin <LpSolit@gmail.com> # #%] -[% PROCESS global/variables.none.tmpl %] <?xml version="1.0" encoding="UTF-8"?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> <ShortName>[% terms.Bugzilla %]</ShortName> diff --git a/template/en/default/search/search-report-graph.html.tmpl b/template/en/default/search/search-report-graph.html.tmpl index 362c910fa..1c6c8298e 100644 --- a/template/en/default/search/search-report-graph.html.tmpl +++ b/template/en/default/search/search-report-graph.html.tmpl @@ -23,8 +23,6 @@ # the interfaces of the templates it contains. #%] -[% PROCESS global/variables.none.tmpl %] - [% js_data = BLOCK %] var queryform = "reportform" [% END %] diff --git a/template/en/default/search/search-report-table.html.tmpl b/template/en/default/search/search-report-table.html.tmpl index c59743965..9951726c5 100644 --- a/template/en/default/search/search-report-table.html.tmpl +++ b/template/en/default/search/search-report-table.html.tmpl @@ -23,8 +23,6 @@ # the interfaces of the templates it contains. #%] -[% PROCESS global/variables.none.tmpl %] - [% js_data = BLOCK %] var queryform = "reportform" [% END %] diff --git a/template/en/default/search/search-specific.html.tmpl b/template/en/default/search/search-specific.html.tmpl index 31d950ec5..f79d9bb4f 100644 --- a/template/en/default/search/search-specific.html.tmpl +++ b/template/en/default/search/search-specific.html.tmpl @@ -18,8 +18,6 @@ # Contributor(s): Myk Melez <myk@mozilla.org> #%] -[% PROCESS global/variables.none.tmpl %] - [% PROCESS global/header.html.tmpl title = "Simple Search" style_urls = [ "skins/standard/search_form.css" ] diff --git a/template/en/default/welcome-admin.html.tmpl b/template/en/default/welcome-admin.html.tmpl index 289a6bd7d..f97a8c0c1 100644 --- a/template/en/default/welcome-admin.html.tmpl +++ b/template/en/default/welcome-admin.html.tmpl @@ -17,8 +17,6 @@ # none #%] -[% PROCESS global/variables.none.tmpl %] - [% title = BLOCK %]Welcome to [% terms.Bugzilla %][% END %] [% PROCESS global/header.html.tmpl diff --git a/template/en/default/whine/mail.html.tmpl b/template/en/default/whine/mail.html.tmpl index ae51ffed7..075757697 100644 --- a/template/en/default/whine/mail.html.tmpl +++ b/template/en/default/whine/mail.html.tmpl @@ -28,7 +28,6 @@ # recipient: user object for the intended recipient of the message #%] -[% PROCESS global/variables.none.tmpl %] [% PROCESS 'global/field-descs.none.tmpl' %] <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> diff --git a/template/en/default/whine/multipart-mime.txt.tmpl b/template/en/default/whine/multipart-mime.txt.tmpl index 7fdfdb026..e25c94269 100644 --- a/template/en/default/whine/multipart-mime.txt.tmpl +++ b/template/en/default/whine/multipart-mime.txt.tmpl @@ -28,8 +28,6 @@ # from: Bugzilla system email address #%] -[% PROCESS global/variables.none.tmpl %] - From: [% from %] To: [% recipient.email %] Subject: [[% terms.Bugzilla %]] [% subject %] diff --git a/template/en/default/whine/schedule.html.tmpl b/template/en/default/whine/schedule.html.tmpl index 245a3e4a9..d85d4c38e 100644 --- a/template/en/default/whine/schedule.html.tmpl +++ b/template/en/default/whine/schedule.html.tmpl @@ -32,8 +32,6 @@ # sort: integer that sets execution order on named queries #%] -[% PROCESS global/variables.none.tmpl %] - [% title = "Set up whining" %] [% PROCESS global/header.html.tmpl title = title |
