From: Frédéric Buclin Date: Sun, 23 Oct 2011 10:59:42 +0000 (+0200) Subject: Bug 696256: global/variables.none.tmpl should be PRE_PROCESS'ed X-Git-Tag: bugzilla-4.3.1~218 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9f859e128e5c9c6e74a95c79ab60ed123a94c14;p=thirdparty%2Fbugzilla.git Bug 696256: global/variables.none.tmpl should be PRE_PROCESS'ed r/a=mkanat --- diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm index 527b704b27..aba584e91e 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 99026c0d55..44e9e9a602 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 #%] -[% PROCESS global/variables.none.tmpl %] [% INCLUDE global/header.html.tmpl title = "Voting" %]

[% 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 4c69a45f6a..b93ebc541f 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 61eaf84915..3c4aab1f93 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 f0d3b7e137..15c3ce4cdd 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 bfb37c90da..6bfbf23257 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 #%] -[% 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 3b858c0b37..a3c2fc5de7 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 39984aeaf2..3d986010c6 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 #%] -[% 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 80dd121537..469d29db18 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 6619dedd3c..51c3d4291c 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 #%] -[% 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 5b82201930..bf273e459e 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 d794198bc2..71be8870e9 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 b40ab9852f..2d9301f1ff 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 #%] -[% 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 ee66c0f24d..9446ee59f9 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 8fb36926f8..c2fe7b70e8 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 e014658dc5..b4eea4875f 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 #%] -[% 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 96a111bae8..6a09b20a2a 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 %] -

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 5e8dc9ca28..981e1bd824 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 %] -
diff --git a/template/en/default/admin/admin.html.tmpl b/template/en/default/admin/admin.html.tmpl index 98f729b027..c4d49fd8de 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 #%] -[% 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 db983aa74c..9d3f4a57ea 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 #%] -[% PROCESS global/variables.none.tmpl %] -

Back to the main [% terms.bugs %] page or edit more classifications.

diff --git a/template/en/default/admin/components/edit.html.tmpl b/template/en/default/admin/components/edit.html.tmpl index 5236186ccd..7a20250456 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 b45b975659..665f876eef 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 0910f9802a..5f173b8f2e 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 9c42ce639c..65f5bf728a 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 2b6aedb6f8..660f9182c4 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 3704d42aa2..ed2ff01d98 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 ed909417dc..9fc6dcaa04 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 #%] -[% 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 2cb985a47f..eb713d978f 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 #%] -[% 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 220db89009..5b33308e26 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 #%] -[% 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 65a62290b6..b1b91f9637 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 c400a23629..50945ee670 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 ef4b7fcc44..e9eefdec94 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 6392f567f7..b89b6920fe 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 587db6d65a..60b7c35cee 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 fd38d65f02..7471f148f7 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 1fc92c928f..f363fa9da0 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 8c634ebfe1..12b5043615 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 #%] -[% 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 161cc4b5ba..cf69c6772a 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 0641c6283c..eb875003f1 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 464297262c..357349d765 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 #%] -[% 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 494a8cdf01..140358d7e8 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 #%] -[% 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 676959c341..6d0ab9b39c 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 #%] - -[% 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 497d67e2e0..95b840877f 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 69435d2203..a96875597f 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 7fded475e5..d92d47b1a1 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 700abb4e8f..ac061135c1 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 #%] -[% 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 14c76c3096..5d47effab6 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 da2fec823b..a57c2fbf23 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 49c662a989..db13b68228 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 %]
- - [% PROCESS global/variables.none.tmpl %] Return to [% "$terms.bug $bugid" FILTER bug_link(bugid) FILTER none %] [% 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 c13b2e7ba9..763629a685 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 fbe3a9c799..a078141a2c 100644 --- a/template/en/default/attachment/edit.html.tmpl +++ b/template/en/default/attachment/edit.html.tmpl @@ -20,8 +20,6 @@ # Guy Pyrzak #%] -[% 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 f7f40fdcb9..d580e95eaa 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!" %]

Mid-air collision detected!

diff --git a/template/en/default/attachment/show-multiple.html.tmpl b/template/en/default/attachment/show-multiple.html.tmpl index e238e5f49a..175e203d75 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 #%] -[% 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 9a74f5c98a..dc23b34bbc 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 67ac689ca9..2fe15289ff 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 9009d38738..2b5b2ba2bd 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 #%] -[% 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 d9eaccbbf6..dbd81714fe 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 13974833ae..869233f7d9 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 ac2cc29df8..b48c09b72a 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 [% terms.bug %] writing guidelines, 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 78fc4a8aaf..aa42d06b38 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 99b231c8e3..75c263e68c 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -24,8 +24,6 @@ # Elliotte Martin #%] -[% 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 1567980261..4c9cbee3f8 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 ac14e6dc0b..8b3636f9ea 100644 --- a/template/en/default/bug/knob.html.tmpl +++ b/template/en/default/bug/knob.html.tmpl @@ -21,7 +21,6 @@ # Guy Pyrzak #%] -[% PROCESS global/variables.none.tmpl %]
[% 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 46b92aec45..f76bac0234 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 %]