From: Dylan William Hardison <dylan@hardison.net>
Date: Wed, 15 May 2019 18:53:10 +0000 (-0400)
Subject: Bug 1549637 - Homepage link on the global header is wrong
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=96794c429d269d95498999e9d3d90b5c50c56b82;p=thirdparty%2Fbugzilla.git

Bug 1549637 - Homepage link on the global header is wrong
---

diff --git a/extensions/BMO/template/en/default/bug/create/create-finance.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-finance.html.tmpl
index 38c0ac74d..59476fa70 100644
--- a/extensions/BMO/template/en/default/bug/create/create-finance.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-finance.html.tmpl
@@ -97,14 +97,14 @@
   </th>
   <td>
     <select name="component" id="component" onchange="showCompDesc(this);">
-      [%- FOREACH c = product.components %]
-        [% NEXT IF NOT c.is_active %]
-        <option value="[% c.name FILTER html %]"
-                id="v[% c.id FILTER html %]_component"
-          [% IF c.name == default.component_ %]
+      [%- FOREACH comp = product.components %]
+        [% NEXT IF NOT comp.is_active %]
+        <option value="[% comp.name FILTER html %]"
+                id="v[% comp.id FILTER html %]_component"
+          [% IF comp.name == default.component_ %]
                 selected="selected"
           [% END %]>
-          [% c.name FILTER html -%]
+          [% comp.name FILTER html -%]
         </option>
       [%- END %]
     </select
diff --git a/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl
index 172914792..878458cb6 100644
--- a/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl
@@ -98,12 +98,12 @@ label.required:before {
     <td>
       <select id="component" name="component" required="required">
         <option value="">Select One</option>
-        [%- FOREACH c = product.components %]
-          [% NEXT IF NOT c.is_active %]
-          [% NEXT IF hide_components.contains(c.name) %]
-          <option value="[% c.name FILTER html %]"
-            [% ' selected="selected"' IF c.name == "General" %]>
-            [% c.name FILTER html -%]
+        [%- FOREACH comp = product.components %]
+          [% NEXT IF NOT comp.is_active %]
+          [% NEXT IF hide_components.contains(comp.name) %]
+          <option value="[% comp.name FILTER html %]"
+            [% ' selected="selected"' IF comp.name == "General" %]>
+            [% comp.name FILTER html -%]
           </option>
         [%- END %]
       </select>
diff --git a/extensions/BMO/template/en/default/bug/create/create-mdn.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mdn.html.tmpl
index aba8b3981..a45917ead 100644
--- a/extensions/BMO/template/en/default/bug/create/create-mdn.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-mdn.html.tmpl
@@ -231,13 +231,13 @@ strong.required:before {
     <p>
       <strong class="required">Component</strong><br>
       <select name="component" id="component" size="7" aria-required="true" class="required">
-        [% FOREACH c = product.components %]
-          [% NEXT IF NOT c.is_active %]
-          <option value="[% c.name FILTER html %]" title="[% c.description FILTER html %]"
-            [%- IF c.name == default.component_ %]
+        [% FOREACH comp = product.components %]
+          [% NEXT IF NOT comp.is_active %]
+          <option value="[% comp.name FILTER html %]" title="[% comp.description FILTER html %]"
+            [%- IF comp.name == default.component_ %]
               selected="selected"
             [% END %]>
-            [% c.name FILTER html -%]
+            [% comp.name FILTER html -%]
           </option>
         [%- END %]
       </select>
diff --git a/extensions/BMO/template/en/default/global/choose-product.html.tmpl b/extensions/BMO/template/en/default/global/choose-product.html.tmpl
index 405812869..f2269360b 100644
--- a/extensions/BMO/template/en/default/global/choose-product.html.tmpl
+++ b/extensions/BMO/template/en/default/global/choose-product.html.tmpl
@@ -157,15 +157,15 @@
 [% ELSE %]
 
   <table>
-    [% FOREACH c = classifications %]
-      [% IF c.object %]
+    [% FOREACH cls = classifications %]
+      [% IF cls.object %]
         <tr>
-          <td align="right"><h2>[% c.object.name FILTER html %]</h2></td>
-          <td><strong>[%+ c.object.description FILTER html_light %]</strong></td>
+          <td align="right"><h2>[% cls.object.name FILTER html %]</h2></td>
+          <td><strong>[%+ cls.object.description FILTER html_light %]</strong></td>
         </tr>
       [% END %]
 
-      [% FOREACH p = c.products %]
+      [% FOREACH p = cls.products %]
         [% class = "" %]
         [% has_entry_groups = 0 %]
         [% FOREACH gid = p.group_controls.keys %]
@@ -219,8 +219,8 @@
 [%###########################################################################%]
 
 [% BLOCK easyproduct %]
-  [% FOREACH c = classifications %]
-    [% FOREACH p = c.products %]
+  [% FOREACH cls = classifications %]
+    [% FOREACH p = cls.products %]
       [% IF p.name == name %]
         <section class="product major">
           <h3>
diff --git a/extensions/BMO/template/en/default/pages/triage_owners.html.tmpl b/extensions/BMO/template/en/default/pages/triage_owners.html.tmpl
index f8a3504b5..be094402f 100644
--- a/extensions/BMO/template/en/default/pages/triage_owners.html.tmpl
+++ b/extensions/BMO/template/en/default/pages/triage_owners.html.tmpl
@@ -102,13 +102,13 @@
           <tr>
             <th>[% r.product FILTER html %]</th>
             <th>Owner</th>
-            [% FOREACH c IN r.bug_counts %]
+            [% FOREACH count IN r.bug_counts %]
               <th class="count">
-                [% IF c.key == "total"%]
+                [% IF count.key == "total"%]
                   Total
                 [% ELSE %]
-                  <span class="bug-type-label iconic" title="[% c.key FILTER html %]"
-                        aria-label="[% c.key FILTER html %]" data-type="[% c.key FILTER html %]">
+                  <span class="bug-type-label iconic" title="[% count.key FILTER html %]"
+                        aria-label="[% count.key FILTER html %]" data-type="[% count.key FILTER html %]">
                     <span class="icon" aria-hidden="true"></span>
                   </span>
                 [% END %]
@@ -129,16 +129,16 @@
             <em>None</em>
           [% END %]
         </td>
-        [% FOREACH c IN r.bug_counts %]
+        [% FOREACH count IN r.bug_counts %]
           <td class="count">
-            [% IF c.value %]
+            [% IF count.value %]
               <a href="[% basepath FILTER none %]buglist.cgi?product=
               [%~ r.product FILTER uri %]&amp;component=[% r.component FILTER uri %]
-              [%~ IF c.key != "total" %]&amp;bug_type=[% c.key FILTER html; END %]&amp;
+              [%~ IF count.key != "total" %]&amp;bug_type=[% count.key FILTER html; END %]&amp;
               [%~ r.buglist_url FILTER html %]">
             [% END %]
-              [%~ c.value FILTER html ~%]
-            [% IF c.value %]
+              [%~ count.value FILTER html ~%]
+            [% IF count.value %]
               </a>
             [% END %]
           </td>
diff --git a/extensions/BMO/template/en/default/pages/triage_reports.html.tmpl b/extensions/BMO/template/en/default/pages/triage_reports.html.tmpl
index cdd96c381..8c67961c9 100644
--- a/extensions/BMO/template/en/default/pages/triage_reports.html.tmpl
+++ b/extensions/BMO/template/en/default/pages/triage_reports.html.tmpl
@@ -28,12 +28,12 @@ var cpts = new Array();
 [% n = 1 %]
 [% FOREACH p = user.get_selectable_products %]
   cpts['[% n FILTER js %]'] = [
-    [%- FOREACH c = p.components %]'[% c.name FILTER js %]'[% ", " UNLESS loop.last %] [%- END -%] ];
+    [%- FOREACH comp = p.components %]'[% comp.name FILTER js %]'[% ", " UNLESS loop.last %] [%- END -%] ];
   [% n = n+1 %]
 [% END %]
 
 var selected_components = [
-  [%- FOREACH c = input.component %]'[% c FILTER js %]'
+  [%- FOREACH comp = input.component %]'[% comp FILTER js %]'
   [%- ',' UNLESS loop.last %] [%- END ~%] ];
 
 [% END %]
diff --git a/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl b/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl
index 260b99f76..55bea4c6a 100644
--- a/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl
+++ b/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl
@@ -154,8 +154,8 @@ Other Mozilla products which aren't listed here
     [% caption = name %]
   [% END %]
   [% IF !desc %]
-    [% FOREACH c = classifications %]
-      [% FOREACH p = c.products %]
+    [% FOREACH cls = classifications %]
+      [% FOREACH p = cls.products %]
         [% IF p.name == name %]
           [% desc = p.description %]
           [% LAST %]
@@ -197,18 +197,18 @@ Other Mozilla products which aren't listed here
 %]
 
 <table id="other_products">
-[% FOREACH c = classifications %]
-  [% IF c.object %]
+[% FOREACH cls = classifications %]
+  [% IF cls.object %]
     <tr class="classification">
       <th align="right" valign="top">
-        [% c.object.name FILTER html %]:&nbsp;
+        [% cls.object.name FILTER html %]:&nbsp;
       </th>
       <td>
-        [% c.object.description FILTER html_light %]
+        [% cls.object.description FILTER html_light %]
       </td>
     </tr>
   [% END %]
-  [% FOREACH p = c.products %]
+  [% FOREACH p = cls.products %]
     <tr>
       <th align="right" valign="top">
         <a href="javascript:void(0)" onclick="product.select('[% p.name FILTER js %]')">
diff --git a/extensions/Review/template/en/default/hook/global/header-start.html.tmpl b/extensions/Review/template/en/default/hook/global/header-start.html.tmpl
index af2f31d31..87526d965 100644
--- a/extensions/Review/template/en/default/hook/global/header-start.html.tmpl
+++ b/extensions/Review/template/en/default/hook/global/header-start.html.tmpl
@@ -64,10 +64,10 @@
       ],
     [% ELSE %]
       [%# all components (create bug) %]
-      [% FOREACH c = product_obj.components %]
-        [% NEXT UNLESS c.reviewers %]
-        '[% c.name FILTER js %]': [
-          [% FOREACH u = c.reviewers_objs %]
+      [% FOREACH comp = product_obj.components %]
+        [% NEXT UNLESS comp.reviewers %]
+        '[% comp.name FILTER js %]': [
+          [% FOREACH u = comp.reviewers_objs %]
             [% NEXT IF u.id == user.id %]
             [% PROCESS reviewer %][% "," UNLESS loop.last %]
           [% END %]
diff --git a/extensions/TrackingFlags/template/en/default/pages/tracking_flags_admin_edit.html.tmpl b/extensions/TrackingFlags/template/en/default/pages/tracking_flags_admin_edit.html.tmpl
index d1cdf48f4..224805871 100644
--- a/extensions/TrackingFlags/template/en/default/pages/tracking_flags_admin_edit.html.tmpl
+++ b/extensions/TrackingFlags/template/en/default/pages/tracking_flags_admin_edit.html.tmpl
@@ -14,11 +14,11 @@ var cpts = new Array();
 [% n = 1 %]
 [% FOREACH p = user.get_selectable_products %]
   cpts['[% n FILTER js %]'] = [
-    [%- FOREACH c = p.components %]'[% c.name FILTER js %]'[% ", " UNLESS loop.last %] [%- END -%] ];
+    [%- FOREACH comp = p.components %]'[% comp.name FILTER js %]'[% ", " UNLESS loop.last %] [%- END -%] ];
   [% n = n+1 %]
 [% END %]
 var selected_components = [
-  [%- FOREACH c = input.component %]'[% c FILTER js %]'
+  [%- FOREACH comp = input.component %]'[% comp FILTER js %]'
   [%- ',' UNLESS loop.last %] [%- END ~%] ];
 [% END %]
 
diff --git a/extensions/UserStory/template/en/default/hook/bug/create/create-after_custom_fields.html.tmpl b/extensions/UserStory/template/en/default/hook/bug/create/create-after_custom_fields.html.tmpl
index 6079ec616..3ec91ad3c 100644
--- a/extensions/UserStory/template/en/default/hook/bug/create/create-after_custom_fields.html.tmpl
+++ b/extensions/UserStory/template/en/default/hook/bug/create/create-after_custom_fields.html.tmpl
@@ -34,8 +34,8 @@
       </div>
       <script [% script_nonce FILTER none %]>
         var user_story_exclude_components = [];
-        [% FOREACH c = default.user_story_visible.1 %]
-          user_story_exclude_components.push('[% c FILTER js %]');
+        [% FOREACH comp = default.user_story_visible.1 %]
+          user_story_exclude_components.push('[% comp FILTER js %]');
         [% END %]
         function toggleUserStory() {
           if (YAHOO.util.Dom.get('user_story').value != '') {
diff --git a/template/en/default/admin/products/confirm-delete.html.tmpl b/template/en/default/admin/products/confirm-delete.html.tmpl
index 8b885332b..68ad5fc1d 100644
--- a/template/en/default/admin/products/confirm-delete.html.tmpl
+++ b/template/en/default/admin/products/confirm-delete.html.tmpl
@@ -115,13 +115,13 @@
     <td>
       [% IF product.components.size > 0 %]
         <table>
-          [% FOREACH c = product.components %]
+          [% FOREACH comp = product.components %]
             <tr>
-              <th align="right">[% c.name FILTER html %]:</th>
+              <th align="right">[% comp.name FILTER html %]:</th>
               [%# descriptions are intentionally not filtered to allow html content %]
               <td>
-                [% IF c.description %]
-                  [% c.description FILTER html_light %]
+                [% IF comp.description %]
+                  [% comp.description FILTER html_light %]
                 [% ELSE %]
                   <span style="color: red">missing</span>
                 [% END %]
diff --git a/template/en/default/admin/table.html.tmpl b/template/en/default/admin/table.html.tmpl
index 36d0f796f..9fcbc2ca0 100644
--- a/template/en/default/admin/table.html.tmpl
+++ b/template/en/default/admin/table.html.tmpl
@@ -84,10 +84,10 @@
 
 <table id="admin_table" border="1" cellpadding="4" cellspacing="0">
   <tr bgcolor="#6666FF">
-    [% FOREACH c = columns %]
+    [% FOREACH col = columns %]
       [%# Default to align left for headers %]
-      <th align="[% (c.align || 'left') FILTER html %]">
-        [% c.heading FILTER html %]
+      <th align="[% (col.align || 'left') FILTER html %]">
+        [% col.heading FILTER html %]
       </th>
     [% END %]
   </tr>
@@ -98,20 +98,20 @@
 [% FOREACH row = data %]
 
   <tr>
-    [% FOREACH c = columns %]
+    [% FOREACH col = columns %]
 
       [%# Copy to local variables, as we may update these %]
-      [% contentlink = c.contentlink
-         content = c.content
-         content_use_field = c.content_use_field
-         align = c.align
-         class = c.class
-         allow_html_content = c.allow_html_content
-         yesno_field = c.yesno_field
+      [% contentlink = col.contentlink
+         content = col.content
+         content_use_field = col.content_use_field
+         align = col.align
+         class = col.class
+         allow_html_content = col.allow_html_content
+         yesno_field = col.yesno_field
        %]
 
-      [%# Get any specific "important" overrides for this c.name and row.name ? %]
-      [% SET important = overrides.${c.name}.name.${row.name} %]
+      [%# Get any specific "important" overrides for this col.name and row.name ? %]
+      [% SET important = overrides.${col.name}.name.${row.name} %]
 
       [% IF important %]
 
@@ -122,9 +122,9 @@
       [% ELSE %]
 
           [%# Are there any specific overrides for this column? %]
-          [% FOREACH match_field = overrides.${c.name}.keys %]
+          [% FOREACH match_field = overrides.${col.name}.keys %]
 
-              [% override = overrides.${c.name}.${match_field}.${row.$match_field} %]
+              [% override = overrides.${col.name}.${match_field}.${row.$match_field} %]
               [% NEXT UNLESS override %]
 
               [% FOREACH key IN override.keys %]
@@ -154,23 +154,23 @@
           <a href="[% basepath FILTER none %][% link_uri %]">
         [% END %]
 
-        [% IF content_use_field && field_descs.exists(row.${c.name}) %]
-           [% colname = row.${c.name} %]
+        [% IF content_use_field && field_descs.exists(row.${col.name}) %]
+           [% colname = row.${col.name} %]
            [% field_descs.${colname} FILTER html %]
         [% ELSIF content %]
             [% content FILTER html_light %]
         [% ELSE %]
           [% IF yesno_field %]
-            [% IF row.${c.name} %]
+            [% IF row.${col.name} %]
               Yes
             [% ELSE %]
               No
             [% END %]
           [% ELSE %]
             [% IF allow_html_content %]
-              [% row.${c.name} FILTER html_light %]
+              [% row.${col.name} FILTER html_light %]
             [% ELSE %]
-              [% row.${c.name} FILTER html %]
+              [% row.${col.name} FILTER html %]
             [% END %]
           [% END %]
         [% END %]
diff --git a/template/en/default/bug/create/create-guided.html.tmpl b/template/en/default/bug/create/create-guided.html.tmpl
index 18e02b926..0b31313ac 100644
--- a/template/en/default/bug/create/create-guided.html.tmpl
+++ b/template/en/default/bug/create/create-guided.html.tmpl
@@ -43,8 +43,8 @@
 [%# This script displays the descriptions for selected components. %]
 <script [% script_nonce FILTER none %]>
 var descriptions = [
-[% FOREACH c = product.components %]
-  '[% c.description FILTER js %]',
+[% FOREACH comp = product.components %]
+  '[% comp.description FILTER js %]',
 [% END %]
 ];
 
@@ -170,10 +170,10 @@ function PutDescription() {
                     which is a useful default. %]
                 [% default.component_ = "General" %]
               [% END %]
-              [% FOREACH c = product.components %]
-                <option value="[% c.name FILTER html %]"
-                  [% " selected=\"selected\"" IF c.name == default.component_ %]>
-                  [% c.name FILTER html %]
+              [% FOREACH comp = product.components %]
+                <option value="[% comp.name FILTER html %]"
+                  [% " selected=\"selected\"" IF comp.name == default.component_ %]>
+                  [% comp.name FILTER html %]
                 </option>
               [% END %]
             </select>
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 47e946827..55fa39778 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -83,26 +83,26 @@ var flags = new Array([% product.components.size %]);
     var last_initialqacontact;
 [% END %]
 [% count = 0 %]
-[%- FOREACH c = product.components %]
-    [% NEXT IF NOT c.is_active %]
-    components[[% count %]] = "[% c.name FILTER js %]";
-    comp_desc[[% count %]] = "[% c.description FILTER html_light FILTER js %]";
-    initialowners[[% count %]] = "[% c.default_assignee.login FILTER js %]";
-    default_bug_types[[% count %]] = "[% c.default_bug_type FILTER js %]";
+[%- FOREACH comp = product.components %]
+    [% NEXT IF NOT comp.is_active %]
+    components[[% count %]] = "[% comp.name FILTER js %]";
+    comp_desc[[% count %]] = "[% comp.description FILTER html_light FILTER js %]";
+    initialowners[[% count %]] = "[% comp.default_assignee.login FILTER js %]";
+    default_bug_types[[% count %]] = "[% comp.default_bug_type FILTER js %]";
     [% flag_list = [] %]
-    [% FOREACH f = c.flag_types.bug %]
+    [% FOREACH f = comp.flag_types.bug %]
       [% flag_list.push(f.id) %]
     [% END %]
-    [% FOREACH f = c.flag_types.attachment %]
+    [% FOREACH f = comp.flag_types.attachment %]
       [% flag_list.push(f.id) %]
     [% END %]
     flags[[% count %]] = [[% flag_list.join(",") FILTER js %]];
     [% IF Param("useqacontact") %]
-        initialqacontacts[[% count %]] = "[% c.default_qa_contact.login FILTER js %]";
+        initialqacontacts[[% count %]] = "[% comp.default_qa_contact.login FILTER js %]";
     [% END %]
 
     [% SET initial_cc_list = [] %]
-    [% FOREACH cc_user = c.initial_cc %]
+    [% FOREACH cc_user = comp.initial_cc %]
       [% initial_cc_list.push(cc_user.login) %]
     [% END %]
     initialccs[[% count %]] = "[% initial_cc_list.join(', ') FILTER js %]";
@@ -265,22 +265,22 @@ TUI_hide_default('expert_fields');
           [% qa_contacts_list = user.get_userlist.clone %]
         [% END %]
 
-        [%- FOREACH c = product.components %]
-          [% NEXT IF NOT c.is_active %]
-          <option value="[% c.name FILTER html %]"
-                  id="v[% c.id FILTER html %]_component"
-            [% IF c.name == default.component_ %]
+        [%- FOREACH comp = product.components %]
+          [% NEXT IF NOT comp.is_active %]
+          <option value="[% comp.name FILTER html %]"
+                  id="v[% comp.id FILTER html %]_component"
+            [% IF comp.name == default.component_ %]
               [%# This is for bug/field.html.tmpl, for visibility-related
                 # controls. %]
-              [% default.component_id = c.id %]
+              [% default.component_id = comp.id %]
               selected="selected"
             [% END %]>
-            [% c.name FILTER html -%]
+            [% comp.name FILTER html -%]
           </option>
           [% IF Param("usemenuforusers") %]
-            [% INCLUDE build_userlist default_user = c.default_assignee,
+            [% INCLUDE build_userlist default_user = comp.default_assignee,
                                       userlist = assignees_list %]
-            [% INCLUDE build_userlist default_user = c.default_qa_contact,
+            [% INCLUDE build_userlist default_user = comp.default_qa_contact,
                                       userlist = qa_contacts_list %]
           [% END %]
         [%- END %]
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 5f741f633..fd151b3f1 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -904,8 +904,8 @@
           [% IF user.id && bug.cc.size %]
             <br>
             <ul class="cc_list_display">
-              [% FOREACH c = bug.cc %]
-                <li>[% c FILTER email FILTER html %]</li>
+              [% FOREACH cc_addr = bug.cc %]
+                <li>[% cc_addr FILTER email FILTER html %]</li>
               [% END %]
             </ul>
           [% END %]
@@ -928,9 +928,9 @@
           [% IF bug.cc %]
             <select id="cc" multiple="multiple" size="5"
               [% IF bug.user.canedit %]name="cc"[% END %]>
-              [% FOREACH c = bug.cc %]
-                <option value="[% c FILTER email FILTER html %]">
-                  [% c FILTER email FILTER html %]</option>
+              [% FOREACH cc_addr = bug.cc %]
+                <option value="[% cc_addr FILTER email FILTER html %]">
+                  [% cc_addr FILTER email FILTER html %]</option>
               [% END %]
             </select>
             [% IF user.id && !bug.user.canedit %]
diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl
index 9622de8c8..43be970a7 100644
--- a/template/en/default/bug/show-multiple.html.tmpl
+++ b/template/en/default/bug/show-multiple.html.tmpl
@@ -361,8 +361,8 @@
     [% IF name == "cc" %]
       <th class="rightcell">[% field_descs.cc FILTER html %]:</th>
       <td>
-        [% FOREACH c = bug.cc %]
-          [% c FILTER email FILTER html %][% ", " IF not loop.last() %]
+        [% FOREACH cc_addr = bug.cc %]
+          [% cc_addr FILTER email FILTER html %][% ", " IF not loop.last() %]
         [% END %]
     [% ELSIF name == "reporter" || name == "assigned_to"
              || name == "qa_contact" %]
diff --git a/template/en/default/bug/show.xml.tmpl b/template/en/default/bug/show.xml.tmpl
index cc10cf95e..12b3bf039 100644
--- a/template/en/default/bug/show.xml.tmpl
+++ b/template/en/default/bug/show.xml.tmpl
@@ -67,19 +67,19 @@
       [% PROCESS section_flags obj => bug %]
 
       [% IF displayfields.long_desc %]
-        [% FOREACH c = bug.comments %]
-          [% NEXT IF c.is_private && !user.is_insider %]
-          <long_desc isprivate="[% c.is_private FILTER xml %]">
-            <commentid>[% c.id FILTER xml %]</commentid>
-            [% IF c.is_about_attachment %]
-              <attachid>[% c.extra_data FILTER xml %]</attachid>
+        [% FOREACH comment = bug.comments %]
+          [% NEXT IF comment.is_private && !user.is_insider %]
+          <long_desc isprivate="[% comment.is_private FILTER xml %]">
+            <commentid>[% comment.id FILTER xml %]</commentid>
+            [% IF comment.is_about_attachment %]
+              <attachid>[% comment.extra_data FILTER xml %]</attachid>
             [% END %]
-            <who name="[% c.author.name FILTER xml %]">[% c.author.email FILTER email FILTER xml %]</who>
-            <bug_when>[% c.creation_ts FILTER time("%Y-%m-%d %T %z") FILTER xml %]</bug_when>
-            [% IF user.is_timetracker && (c.work_time - 0 != 0) %]
-              <work_time>[% PROCESS formattimeunit time_unit = c.work_time FILTER xml %]</work_time>
+            <who name="[% comment.author.name FILTER xml %]">[% comment.author.email FILTER email FILTER xml %]</who>
+            <bug_when>[% comment.creation_ts FILTER time("%Y-%m-%d %T %z") FILTER xml %]</bug_when>
+            [% IF user.is_timetracker && (comment.work_time - 0 != 0) %]
+              <work_time>[% PROCESS formattimeunit time_unit = comment.work_time FILTER xml %]</work_time>
             [% END %]
-            <thetext>[% c.body_full FILTER xml %]</thetext>
+            <thetext>[% comment.body_full FILTER xml %]</thetext>
           </long_desc>
         [% END %]
       [% END %]
diff --git a/template/en/default/global/choose-product.html.tmpl b/template/en/default/global/choose-product.html.tmpl
index 75fd645e3..e2bb7775c 100644
--- a/template/en/default/global/choose-product.html.tmpl
+++ b/template/en/default/global/choose-product.html.tmpl
@@ -44,15 +44,15 @@
 
 <table>
 
-[% FOREACH c = classifications %]
-  [% IF c.object %]
+[% FOREACH cls = classifications %]
+  [% IF cls.object %]
     <tr>
-      <th colspan="2" align="left">[% c.object.name FILTER html %]:
-      [%+ c.object.description FILTER html_light %]</th>
+      <th colspan="2" align="left">[% cls.object.name FILTER html %]:
+      [%+ cls.object.description FILTER html_light %]</th>
     </tr>
   [% END %]
 
-  [% FOREACH p = c.products %]
+  [% FOREACH p = cls.products %]
     <tr>
       <th align="right" valign="top">
         <a href="[% target %]?product=[% p.name FILTER uri -%]
diff --git a/template/en/default/reports/series-common.html.tmpl b/template/en/default/reports/series-common.html.tmpl
index 7bf387bd2..3ba0e7582 100644
--- a/template/en/default/reports/series-common.html.tmpl
+++ b/template/en/default/reports/series-common.html.tmpl
@@ -32,14 +32,14 @@
 <script [% script_nonce FILTER none %]>
 [%# This structure holds details of the series the user can select from. %]
 var series = {
-[% FOREACH c = category.keys.sort %]
-  "[%+ c FILTER js %]" : {
-    [% FOREACH s = category.$c.keys.sort %]
+[% FOREACH cat = category.keys.sort %]
+  "[%+ cat FILTER js %]" : {
+    [% FOREACH s = category.$cat.keys.sort %]
       "[%+ s FILTER js %]" : {
         [% IF donames %]
-          [% FOREACH n = category.$c.$s.keys.sort %]
+          [% FOREACH n = category.$cat.$s.keys.sort %]
             "[% n FILTER js %]":
-             [% category.$c.$s.$n FILTER js %][% ", " UNLESS loop.last %]
+             [% category.$cat.$s.$n FILTER js %][% ", " UNLESS loop.last %]
           [% END %]
         [% END %]
       }[% ", " UNLESS loop.last %]
diff --git a/template/en/default/request/queue.html.tmpl b/template/en/default/request/queue.html.tmpl
index cfb1c82b9..23c1e277c 100644
--- a/template/en/default/request/queue.html.tmpl
+++ b/template/en/default/request/queue.html.tmpl
@@ -84,9 +84,9 @@ to some group are shown by default.
         <select name="product" onchange="selectProduct(this, this.form.component, null, null, 'Any');">
           <option value="">Any</option>
           [% IF Param('useclassification') %]
-            [% FOREACH c = user.get_selectable_classifications %]
-              <optgroup label="[% c.name FILTER html %]">
-                [% FOREACH p = user.get_selectable_products(c.id) %]
+            [% FOREACH cls = user.get_selectable_classifications %]
+              <optgroup label="[% cls.name FILTER html %]">
+                [% FOREACH p = user.get_selectable_products(cls.id) %]
                   <option value="[% p.name FILTER html %]"
                     [% " selected" IF cgi.param('product') == p.name %]>
                     [% p.name FILTER html %]
diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl
index 33c6f1f23..d330bca7c 100644
--- a/template/en/default/search/form.html.tmpl
+++ b/template/en/default/search/form.html.tmpl
@@ -43,10 +43,10 @@ var tms = new Array();
 [%# Create an array of products, indexed by the classification #%]
 
 [% nclass = 0 %]
-[% FOREACH c = classification %]
+[% FOREACH cls = classification %]
   prods[[% nclass FILTER js %]] = [
     [% sep = '' %]
-    [%- FOREACH item = user.get_selectable_products(c.id) -%]
+    [%- FOREACH item = user.get_selectable_products(cls.id) -%]
       [%- IF item.components.size -%]
         [%- sep FILTER js %]'[% item.name FILTER js %]'
         [%- sep = ',' -%]
diff --git a/template/en/default/search/search-instant.html.tmpl b/template/en/default/search/search-instant.html.tmpl
index e7d87084f..b36ac98f5 100644
--- a/template/en/default/search/search-instant.html.tmpl
+++ b/template/en/default/search/search-instant.html.tmpl
@@ -43,9 +43,9 @@ YAHOO.bugzilla.instantSearch.setLabels( {
     <td>
       <select name="product" id="product">
         [% IF Param('useclassification') %]
-          [% FOREACH c = classification %]
-            <optgroup label="[% c.name FILTER html %]">
-            [% FOREACH p = user.get_selectable_products(c.id) %]
+          [% FOREACH cls = classification %]
+            <optgroup label="[% cls.name FILTER html %]">
+            [% FOREACH p = user.get_selectable_products(cls.id) %]
               [% IF p.components.size %]
                 <option value="[% p.name FILTER html %]"
                   [% " selected" IF lsearch(default.product, p.name) != -1 %]>
diff --git a/template/en/default/search/search-specific.html.tmpl b/template/en/default/search/search-specific.html.tmpl
index 11f79cbe7..5f45154ba 100644
--- a/template/en/default/search/search-specific.html.tmpl
+++ b/template/en/default/search/search-specific.html.tmpl
@@ -70,9 +70,9 @@ for "crash secure SSL flash".
       <select name="product" id="product">
         <option value="">All</option>
         [% IF Param('useclassification') %]
-          [% FOREACH c = classification %]
-            <optgroup label="[% c.name FILTER html %]">
-            [% FOREACH p = user.get_selectable_products(c.id) %]
+          [% FOREACH cls = classification %]
+            <optgroup label="[% cls.name FILTER html %]">
+            [% FOREACH p = user.get_selectable_products(cls.id) %]
               [% IF p.components.size %]
                 <option value="[% p.name FILTER html %]"
                   [% " selected" IF default.product.contains(p.name) %]>